diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-21 11:54:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-21 11:54:49 -0800 |
| commit | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch) | |
| tree | 2910816b23718e9cebd20be9eae2b6876edd849b /drivers/net/Kconfig | |
| parent | b74665606962456af7f92b1e448cee30ce70967b (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
| download | blackbird-op-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.gz blackbird-op-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 |
