summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-23 14:09:17 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-23 14:09:17 -0800
commitb4de921ae6f7bb211868be4f7d56e80ac6da676c (patch)
treed0d740c43519d0e2b290f1499f82e2c03d6520a6 /drivers/net/Kconfig
parent17a3be341e55b49e4579634281b86f1eb0bad8e8 (diff)
parented4b2019a62e2208a8370461dd91ed4de2c9fc8f (diff)
downloadlinux-b4de921ae6f7bb211868be4f7d56e80ac6da676c.tar.gz
linux-b4de921ae6f7bb211868be4f7d56e80ac6da676c.tar.bz2
linux-b4de921ae6f7bb211868be4f7d56e80ac6da676c.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e58a65391ad2..dd9a09c72dff 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2346,6 +2346,7 @@ config GELIC_NET
config GELIC_WIRELESS
bool "PS3 Wireless support"
+ depends on WLAN
depends on GELIC_NET
select WIRELESS_EXT
help
@@ -2358,6 +2359,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