diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-11 15:01:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-11 15:01:23 +1000 |
| commit | dcd0ff3b3cc08e2dfb41b5ff735e385496e79836 (patch) | |
| tree | 2cef67c2eb8bc793ba15ced98e6f18cfd2d071ad /drivers/staging/arlan/Kconfig | |
| parent | e3def81801ae3586f5bb2586f3b0cb1801095ccd (diff) | |
| parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/arlan/Kconfig')
| -rw-r--r-- | drivers/staging/arlan/Kconfig | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/arlan/Kconfig b/drivers/staging/arlan/Kconfig deleted file mode 100644 index 5e42b81f97b0..000000000000 --- a/drivers/staging/arlan/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -config ARLAN - tristate "Aironet Arlan 655 & IC2200 DS support" - depends on ISA && !64BIT && WLAN - 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. |