wavelan: move driver to staging

Move the wavelan driver to drivers/staging.  This is another pre-802.11
driver that has seen virtually no non-API-fixup activity in years, and
for which no active hardware is likely to still exist.  This driver
represents unnecessary ongoing maintenance for no clear benefit.

This patch brought to you by the "hacking" session at the 2009 Kernel
Summit in Tokyo, Japan...

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d50b3bee9a9bad4763ed0d1566cc644c2b6a5e58..f94188f05a02bc20dd1611a4420af5c6d4414834 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -25,45 +25,6 @@ menuconfig WLAN_PRE80211
          This option does not affect the kernel build, it only
          lets you choose drivers.
 
-config WAVELAN
-       tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
-       depends on ISA && WLAN_PRE80211
-       select WIRELESS_EXT
-       select WEXT_SPY
-       select WEXT_PRIV
-       ---help---
-         The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is
-         a Radio LAN (wireless Ethernet-like Local Area Network) using the
-         radio frequencies 900 MHz and 2.4 GHz.
-
-         If you want to use an ISA WaveLAN card under Linux, say Y and read
-         the Ethernet-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>. Some more specific
-         information is contained in
-         <file:Documentation/networking/wavelan.txt> and in the source code
-         <file:drivers/net/wireless/wavelan.p.h>.
-
-         You will also need the wireless tools package available from
-         <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
-         Please read the man pages contained therein.
-
-         To compile this driver as a module, choose M here: the module will be
-         called wavelan.
-
-config PCMCIA_WAVELAN
-       tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"
-       depends on PCMCIA && WLAN_PRE80211
-       select WIRELESS_EXT
-       select WEXT_SPY
-       select WEXT_PRIV
-       help
-         Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA
-         (PC-card) wireless Ethernet networking card to your computer.  This
-         driver is for the non-IEEE-802.11 Wavelan cards.
-
-         To compile this driver as a module, choose M here: the module will be
-         called wavelan_cs.  If unsure, say N.
-
 config PCMCIA_NETWAVE
        tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
        depends on PCMCIA && WLAN_PRE80211

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index b56c70f4ca75ffa29783498e174256b5ccc42a82..f4a7c8ae27ea1e79e2728d935c28be7321fcf58d 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -6,9 +6,7 @@ obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
 
 # Obsolete cards
-obj-$(CONFIG_WAVELAN)          += wavelan.o
 obj-$(CONFIG_PCMCIA_NETWAVE)   += netwave_cs.o
-obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan_cs.o
 
 obj-$(CONFIG_HERMES)           += orinoco/
 

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index ca946ca3823b1028ffe598d42612207953938e14..c1082f20534ccc8078c299c68e8f6484ab972529 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -135,5 +135,7 @@ source "drivers/staging/strip/Kconfig"
 
 source "drivers/staging/arlan/Kconfig"
 
+source "drivers/staging/wavelan/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ed92324178bda86599c2e5619d86335a90e7aa73..7bccdd3e7fabaf35d9c3a9c938700435f62ea5c0 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -49,3 +49,5 @@ obj-$(CONFIG_IIO)             += iio/
 obj-$(CONFIG_COWLOOP)          += cowloop/
 obj-$(CONFIG_STRIP)            += strip/
 obj-$(CONFIG_ARLAN)            += arlan/
+obj-$(CONFIG_WAVELAN)          += wavelan/
+obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan/

diff --git a/drivers/staging/wavelan/Kconfig b/drivers/staging/wavelan/Kconfig
new file mode 100644 (file)
index 0000000..786060e
--- /dev/null
+++ b/drivers/staging/wavelan/Kconfig
@@ -0,0 +1,38 @@
+config WAVELAN
+       tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
+       depends on ISA
+       select WIRELESS_EXT
+       select WEXT_SPY
+       select WEXT_PRIV
+       ---help---
+         The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is
+         a Radio LAN (wireless Ethernet-like Local Area Network) using the
+         radio frequencies 900 MHz and 2.4 GHz.
+
+         If you want to use an ISA WaveLAN card under Linux, say Y and read
+         the Ethernet-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>. Some more specific
+         information is contained in
+         <file:Documentation/networking/wavelan.txt> and in the source code
+         <file:drivers/net/wireless/wavelan.p.h>.
+
+         You will also need the wireless tools package available from
+         <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+         Please read the man pages contained therein.
+
+         To compile this driver as a module, choose M here: the module will be
+         called wavelan.
+
+config PCMCIA_WAVELAN
+       tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"
+       depends on PCMCIA
+       select WIRELESS_EXT
+       select WEXT_SPY
+       select WEXT_PRIV
+       help
+         Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA
+         (PC-card) wireless Ethernet networking card to your computer.  This
+         driver is for the non-IEEE-802.11 Wavelan cards.
+
+         To compile this driver as a module, choose M here: the module will be
+         called wavelan_cs.  If unsure, say N.

diff --git a/drivers/staging/wavelan/Makefile b/drivers/staging/wavelan/Makefile
new file mode 100644 (file)
index 0000000..1cde17c
--- /dev/null
+++ b/drivers/staging/wavelan/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_WAVELAN)          += wavelan.o
+obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan_cs.o

diff --git a/drivers/net/wireless/i82586.h b/drivers/staging/wavelan/i82586.h
similarity index 100%
rename from drivers/net/wireless/i82586.h
rename to drivers/staging/wavelan/i82586.h

diff --git a/drivers/net/wireless/i82593.h b/drivers/staging/wavelan/i82593.h
similarity index 100%
rename from drivers/net/wireless/i82593.h
rename to drivers/staging/wavelan/i82593.h

diff --git a/drivers/net/wireless/wavelan.c b/drivers/staging/wavelan/wavelan.c
similarity index 100%
rename from drivers/net/wireless/wavelan.c
rename to drivers/staging/wavelan/wavelan.c

diff --git a/drivers/net/wireless/wavelan.h b/drivers/staging/wavelan/wavelan.h
similarity index 100%
rename from drivers/net/wireless/wavelan.h
rename to drivers/staging/wavelan/wavelan.h

diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/staging/wavelan/wavelan.p.h
similarity index 100%
rename from drivers/net/wireless/wavelan.p.h
rename to drivers/staging/wavelan/wavelan.p.h

diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/staging/wavelan/wavelan_cs.c
similarity index 100%
rename from drivers/net/wireless/wavelan_cs.c
rename to drivers/staging/wavelan/wavelan_cs.c

diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/staging/wavelan/wavelan_cs.h
similarity index 100%
rename from drivers/net/wireless/wavelan_cs.h
rename to drivers/staging/wavelan/wavelan_cs.h

diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/staging/wavelan/wavelan_cs.p.h
similarity index 100%
rename from drivers/net/wireless/wavelan_cs.p.h
rename to drivers/staging/wavelan/wavelan_cs.p.h