diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-10-20 00:53:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-30 16:50:33 -0400 |
commit | e38879efd336fb78b288dcebdc9ca030fd24f449 (patch) | |
tree | 61e0caaf24485474e52085658e46909e822a7fc0 /drivers | |
parent | 955015bb0b42167d14f776ff5947ae2463a974dc (diff) |
arlan: move driver to staging
Move the arlan 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/Kconfig | 16 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 4 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/arlan/Kconfig | 15 | ||||
-rw-r--r-- | drivers/staging/arlan/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/arlan/arlan-main.c (renamed from drivers/net/wireless/arlan-main.c) | 0 | ||||
-rw-r--r-- | drivers/staging/arlan/arlan-proc.c (renamed from drivers/net/wireless/arlan-proc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/arlan/arlan.h (renamed from drivers/net/wireless/arlan.h) | 0 |
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 | |||
25 | This option does not affect the kernel build, it only | 25 | This option does not affect the kernel build, it only |
26 | lets you choose drivers. | 26 | lets you choose drivers. |
27 | 27 | ||
28 | config ARLAN | ||
29 | tristate "Aironet Arlan 655 & IC2200 DS support" | ||
30 | depends on ISA && !64BIT && WLAN_PRE80211 | ||
31 | select WIRELESS_EXT | ||
32 | ---help--- | ||
33 | Aironet makes Arlan, a class of wireless LAN adapters. These use the | ||
34 | www.Telxon.com chip, which is also used on several similar cards. | ||
35 | This driver is tested on the 655 and IC2200 series cards. Look at | ||
36 | <http://www.ylenurme.ee/~elmer/655/> for the latest information. | ||
37 | |||
38 | The driver is built as two modules, arlan and arlan-proc. The latter | ||
39 | is the /proc interface and is not needed most of time. | ||
40 | |||
41 | On some computers the card ends up in non-valid state after some | ||
42 | time. Use a ping-reset script to clear it. | ||
43 | |||
44 | config WAVELAN | 28 | config WAVELAN |
45 | tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support" | 29 | tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support" |
46 | depends on ISA && WLAN_PRE80211 | 30 | 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 @@ | |||
5 | obj-$(CONFIG_IPW2100) += ipw2x00/ | 5 | obj-$(CONFIG_IPW2100) += ipw2x00/ |
6 | obj-$(CONFIG_IPW2200) += ipw2x00/ | 6 | obj-$(CONFIG_IPW2200) += ipw2x00/ |
7 | 7 | ||
8 | obj-$(CONFIG_ARLAN) += arlan.o | ||
9 | |||
10 | arlan-objs := arlan-main.o arlan-proc.o | ||
11 | |||
12 | # Obsolete cards | 8 | # Obsolete cards |
13 | obj-$(CONFIG_WAVELAN) += wavelan.o | 9 | obj-$(CONFIG_WAVELAN) += wavelan.o |
14 | obj-$(CONFIG_PCMCIA_NETWAVE) += netwave_cs.o | 10 | 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" | |||
133 | 133 | ||
134 | source "drivers/staging/strip/Kconfig" | 134 | source "drivers/staging/strip/Kconfig" |
135 | 135 | ||
136 | source "drivers/staging/arlan/Kconfig" | ||
137 | |||
136 | endif # !STAGING_EXCLUDE_BUILD | 138 | endif # !STAGING_EXCLUDE_BUILD |
137 | endif # STAGING | 139 | 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/ | |||
48 | obj-$(CONFIG_IIO) += iio/ | 48 | obj-$(CONFIG_IIO) += iio/ |
49 | obj-$(CONFIG_COWLOOP) += cowloop/ | 49 | obj-$(CONFIG_COWLOOP) += cowloop/ |
50 | obj-$(CONFIG_STRIP) += strip/ | 50 | obj-$(CONFIG_STRIP) += strip/ |
51 | 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 @@ | |||
1 | config ARLAN | ||
2 | tristate "Aironet Arlan 655 & IC2200 DS support" | ||
3 | depends on ISA && !64BIT | ||
4 | select WIRELESS_EXT | ||
5 | ---help--- | ||
6 | Aironet makes Arlan, a class of wireless LAN adapters. These use the | ||
7 | www.Telxon.com chip, which is also used on several similar cards. | ||
8 | This driver is tested on the 655 and IC2200 series cards. Look at | ||
9 | <http://www.ylenurme.ee/~elmer/655/> for the latest information. | ||
10 | |||
11 | The driver is built as two modules, arlan and arlan-proc. The latter | ||
12 | is the /proc interface and is not needed most of time. | ||
13 | |||
14 | On some computers the card ends up in non-valid state after some | ||
15 | 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 @@ | |||
1 | obj-$(CONFIG_ARLAN) += arlan.o | ||
2 | |||
3 | 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 | |||