Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d5b006f5b86f49c31fefd1ce41ae7e07721dd70e..4c7ff61a1a9cd1080ec26c061020792708ec332f 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -14,6 +14,30 @@ config WLAN_PRE80211
          This option does not affect the kernel build, it only
          lets you choose drivers.
 
+config STRIP
+       tristate "STRIP (Metricom starmode radio IP)"
+       depends on INET && WLAN_PRE80211
+       select WIRELESS_EXT
+       ---help---
+         Say Y if you have a Metricom radio and intend to use Starmode Radio
+         IP. STRIP is a radio protocol developed for the MosquitoNet project
+         (on the WWW at <http://mosquitonet.stanford.edu/>) to send Internet
+         traffic using Metricom radios.  Metricom radios are small, battery
+         powered, 100kbit/sec packet radio transceivers, about the size and
+         weight of a cellular telephone. (You may also have heard them called
+         "Metricom modems" but we avoid the term "modem" because it misleads
+         many people into thinking that you can plug a Metricom modem into a
+         phone line and use it as a modem.)
+
+         You can use STRIP on any Linux machine with a serial port, although
+         it is obviously most useful for people with laptop computers. If you
+         think you might get a Metricom radio in the future, there is no harm
+         in saying Y to STRIP now, except that it makes the kernel a bit
+         bigger.
+
+         To compile this as a module, choose M here: the module will be
+         called strip.
+
 config ARLAN
        tristate "Aironet Arlan 655 & IC2200 DS support"
        depends on ISA && !64BIT && WLAN_PRE80211
@@ -625,6 +649,7 @@ config RTL8187
          Trendnet TEW-424UB
          ASUS P5B Deluxe
          Toshiba Satellite Pro series of laptops
+         Asus Wireless Link
 
          Thanks to Realtek for their support!