9 files changed, 21 insertions, 20 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 5df47486e358..d50b3bee9a9b 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -25,22 +25,6 @@ menuconfig WLAN_PRE80211
           This option does not affect the kernel build, it only
           lets you choose drivers.
 
-config ARLAN
-        tristate "Aironet Arlan 655 & IC2200 DS support"
-        depends on ISA && !64BIT && WLAN_PRE80211
-        select WIRELESS_EXT
-        ---help---
-          Aironet makes Arlan, a class of wireless LAN adapters. These use the
-          www.Telxon.com chip, which is also used on several similar cards.
-          This driver is tested on the 655 and IC2200 series cards. Look at
-          <http://www.ylenurme.ee/~elmer/655/> for the latest information.
-
-          The driver is built as two modules, arlan and arlan-proc. The latter
-          is the /proc interface and is not needed most of time.
-
-          On some computers the card ends up in non-valid state after some
-          time. Use a ping-reset script to clear it.
-
 config WAVELAN
         tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
         depends on ISA && WLAN_PRE80211
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 527c272aa1af..b56c70f4ca75 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -5,10 +5,6 @@
 obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
 
-obj-$(CONFIG_ARLAN) += arlan.o 
-
-arlan-objs := arlan-main.o arlan-proc.o
-
 # Obsolete cards
 obj-$(CONFIG_WAVELAN)           += wavelan.o
 obj-$(CONFIG_PCMCIA_NETWAVE)    += netwave_cs.o
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7ddc5c8d8956..ca946ca3823b 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -133,5 +133,7 @@ source "drivers/staging/cowloop/Kconfig"
 
 source "drivers/staging/strip/Kconfig"
 
+source "drivers/staging/arlan/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 4386a620e9b2..ed92324178bd 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -48,3 +48,4 @@ obj-$(CONFIG_DX_SEP)		+= sep/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_COWLOOP)           += cowloop/
 obj-$(CONFIG_STRIP)             += strip/
+obj-$(CONFIG_ARLAN)             += arlan/
diff --git a/drivers/staging/arlan/Kconfig b/drivers/staging/arlan/Kconfig
new file mode 100644
index 000000000000..0585ed8b4d3e
--- /dev/null
+++ b/drivers/staging/arlan/Kconfig
@@ -0,0 +1,15 @@
+config ARLAN
+        tristate "Aironet Arlan 655 & IC2200 DS support"
+        depends on ISA && !64BIT
+        select WIRELESS_EXT
+        ---help---
+          Aironet makes Arlan, a class of wireless LAN adapters. These use the
+          www.Telxon.com chip, which is also used on several similar cards.
+          This driver is tested on the 655 and IC2200 series cards. Look at
+          <http://www.ylenurme.ee/~elmer/655/> for the latest information.
+
+          The driver is built as two modules, arlan and arlan-proc. The latter
+          is the /proc interface and is not needed most of time.
+
+          On some computers the card ends up in non-valid state after some
+          time. Use a ping-reset script to clear it.
diff --git a/drivers/staging/arlan/Makefile b/drivers/staging/arlan/Makefile
new file mode 100644
index 000000000000..9e58e5fae7b9
--- /dev/null
+++ b/drivers/staging/arlan/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_ARLAN) += arlan.o 
+
+arlan-objs := arlan-main.o arlan-proc.o
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/staging/arlan/arlan-main.c
index 921a082487a1..921a082487a1 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/staging/arlan/arlan-main.c
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/staging/arlan/arlan-proc.c
index a8b689635a3b..a8b689635a3b 100644
--- a/drivers/net/wireless/arlan-proc.c
+++ b/drivers/staging/arlan/arlan-proc.c
diff --git a/drivers/net/wireless/arlan.h b/drivers/staging/arlan/arlan.h
index fb3ad51a1caf..fb3ad51a1caf 100644
--- a/drivers/net/wireless/arlan.h
+++ b/drivers/staging/arlan/arlan.h