diff options
| author | David S. Miller | 2009-12-21 20:54:49 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-21 20:54:49 +0100 |
| commit | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch) | |
| tree | 2910816b23718e9cebd20be9eae2b6876edd849b /drivers/net/Kconfig | |
| parent | bnx2: Fix bnx2_netif_stop() merge error. (diff) | |
| parent | ps3_gelic_wireless: Fix build failure due to missing WEXT_PRIV (diff) | |
| download | kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.gz kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.xz kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a5be9ac6405c..6c521b4c319d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2344,6 +2344,7 @@ config GELIC_NET config GELIC_WIRELESS bool "PS3 Wireless support" + depends on WLAN depends on GELIC_NET select WIRELESS_EXT help @@ -2356,6 +2357,7 @@ config GELIC_WIRELESS config GELIC_WIRELESS_OLD_PSK_INTERFACE bool "PS3 Wireless private PSK interface (OBSOLETE)" depends on GELIC_WIRELESS + select WEXT_PRIV help This option retains the obsolete private interface to pass the PSK from user space programs to the driver. The PSK |