diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/otus/Kconfig | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/Kconfig')
| -rw-r--r-- | drivers/staging/otus/Kconfig | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig deleted file mode 100644 index e918134..0000000 --- a/drivers/staging/otus/Kconfig +++ /dev/null @@ -1,34 +0,0 @@ -config OTUS - tristate "Atheros OTUS 802.11n USB wireless support" - depends on USB && WLAN && MAC80211 - select WIRELESS_EXT - select WEXT_PRIV - default N - ---help--- - Enable support for Atheros 802.11n USB hardware: - * UB81 - 2x2 2.4 GHz - * UB82 - 2x2 2.4 GHz and 5 GHz - * UB83 - 1x2 2.4 GHz - - This includes the following devices currently on the market: - Dlink DWA-160A1, Netgear WNDA3100 and WN111v2, TP-Link - TL-WN821N, and AVM FRITZ!WLAN N USB Stick. - - This driver requires its own supplicant driver for - wpa_supplicant 0.4.8. For your convenience you can find the - tarball here: - - http://www.kernel.org/pub/linux/kernel/people/mcgrof/otus/wpa_supplicant-0.4.8_otus.tar.bz2 - - Before compiling wpa_supplicant, ensure your .config has at - least the following: - CONFIG_WIRELESS_EXTENSION=y - CONFIG_EAP_WSC=y - CONFIG_WSC_IE=y - CONFIG_DRIVER_WEXT=y - CONFIG_DRIVER_OTUS=y - - After a successful compile, you can use the Atheros device as - shown in the example: - $ wpa_supplicant -Dotus -i <atheros device from ifconfig> -c /path/to/wpa_supplicant.conf -d - |
