rt2x00 should use generic eeprom_93cx6

PATCH RESEND In review Ivo van Doorn 1 participant 1 message Jan 3, 2007

Subsystems (3)

Networking Network drivers Networking drivers (wireless)

lore

Share & tools

lore

Ivo van Doorn

author

2007-01-03 20:30 UTC #0 lore raw

PATCH RESEND 2/4 rt2x00 should use generic eeprom_93cx6

This patch removes the eeprom_93cx6 files from rt2x00 and makes sure rt2x00 will use the generic eeprom_93cx6 implementation inside the lib folder.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/rt2x00/Kconfig +0 -9

diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/Kconfig wireless-dev_eeprom/drivers/net/wireless/d80211/rt2x00/Kconfig
@@ -82,15 +82,6 @@
 	---help---
 	Enable debugging output.
 
-config EEPROM_93CX6
-	tristate "EEPROM 93CX6 support"
-	depends on RT2x00
-	---help---
-	This is an experimental driver for EEPROM chipsets 93c46 and 93c66.
-	These chipsets are found inside the Ralink wireless cards.
-
-	When compiled as a module, this driver will be called "eeprom_93c6.ko".
-
 config CRC_ITU_T
 	tristate "CRC ITU-T V.41 functions"
 	help

drivers/net/wireless/d80211/rt2x00/Makefile +0 -1

diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/Makefile wireless-dev_eeprom/drivers/net/wireless/d80211/rt2x00/Makefile
@@ -4,4 +4,3 @@
 obj-$(CONFIG_RT2500USB)		+= rt2500usb.o
 obj-$(CONFIG_RT73USB)		+= rt73usb.o
 obj-$(CONFIG_CRC_ITU_T)		+= crc-itu-t.o
-obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o

drivers/net/wireless/d80211/rt2x00/eeprom_93cx6.c +0 ~~-189~~

189 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/eeprom_93cx6.h +0 ~~-90~~

90 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/rt2400pci.c +1 -1

diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev_eeprom/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -53,7 +54,6 @@
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2400pci.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.

drivers/net/wireless/d80211/rt2x00/rt2500pci.c +1 -1

diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev_eeprom/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -53,7 +54,6 @@
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2500pci.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.

drivers/net/wireless/d80211/rt2x00/rt61pci.c +1 -1

diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev_eeprom/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
+#include <linux/eeprom_93cx6.h>
 #include <linux/firmware.h>
 
 #include <net/iw_handler.h>

@@ -55,7 +56,6 @@
 #include "rt2x00pci.h"
 #include "rt61pci.h"
 #include "crc-itu-t.h"
-#include "eeprom_93cx6.h"
 
 /*
  * Register access.