14 files changed, 44 insertions, 41 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d50b3bee9a9b..f94188f05a02 100644
--- 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 b56c70f4ca75..f4a7c8ae27ea 100644
--- 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 ca946ca3823b..c1082f20534c 100644
--- 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 ed92324178bd..7bccdd3e7fab 100644
--- 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
index 000000000000..786060e025c0
--- /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
index 000000000000..1cde17c69a43
--- /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
index 5f65b250646f..5f65b250646f 100644
--- a/drivers/net/wireless/i82586.h
+++ b/drivers/staging/wavelan/i82586.h
diff --git a/drivers/net/wireless/i82593.h b/drivers/staging/wavelan/i82593.h
index afac5c7a323d..afac5c7a323d 100644
--- a/drivers/net/wireless/i82593.h
+++ b/drivers/staging/wavelan/i82593.h
diff --git a/drivers/net/wireless/wavelan.c b/drivers/staging/wavelan/wavelan.c
index d634b2da3b84..d634b2da3b84 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/staging/wavelan/wavelan.c
diff --git a/drivers/net/wireless/wavelan.h b/drivers/staging/wavelan/wavelan.h
index 9ab360558ffd..9ab360558ffd 100644
--- a/drivers/net/wireless/wavelan.h
+++ b/drivers/staging/wavelan/wavelan.h
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/staging/wavelan/wavelan.p.h
index dbe8de6e5f52..dbe8de6e5f52 100644
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/staging/wavelan/wavelan.p.h
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/staging/wavelan/wavelan_cs.c
index 431a20ec6db6..431a20ec6db6 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/staging/wavelan/wavelan_cs.c
diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/staging/wavelan/wavelan_cs.h
index 2e4bfe4147c6..2e4bfe4147c6 100644
--- a/drivers/net/wireless/wavelan_cs.h
+++ b/drivers/staging/wavelan/wavelan_cs.h
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/staging/wavelan/wavelan_cs.p.h
index 81d91531c4f9..81d91531c4f9 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/staging/wavelan/wavelan_cs.p.h