diff options
| author | David S. Miller | 2009-12-23 23:09:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-23 23:09:17 +0100 |
| commit | b4de921ae6f7bb211868be4f7d56e80ac6da676c (patch) | |
| tree | d0d740c43519d0e2b290f1499f82e2c03d6520a6 /drivers/net/Kconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | kernel-qcow2-linux-b4de921ae6f7bb211868be4f7d56e80ac6da676c.tar.gz kernel-qcow2-linux-b4de921ae6f7bb211868be4f7d56e80ac6da676c.tar.xz kernel-qcow2-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/Kconfig | 2 |
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 |