diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-21 14:54:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-21 14:54:49 -0500 |
| commit | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch) | |
| tree | 2910816b23718e9cebd20be9eae2b6876edd849b /drivers/net/Kconfig | |
| parent | b74665606962456af7f92b1e448cee30ce70967b (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
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 | |||
| 2344 | 2344 | ||
| 2345 | config GELIC_WIRELESS | 2345 | config GELIC_WIRELESS |
| 2346 | bool "PS3 Wireless support" | 2346 | bool "PS3 Wireless support" |
| 2347 | depends on WLAN | ||
| 2347 | depends on GELIC_NET | 2348 | depends on GELIC_NET |
| 2348 | select WIRELESS_EXT | 2349 | select WIRELESS_EXT |
| 2349 | help | 2350 | help |
| @@ -2356,6 +2357,7 @@ config GELIC_WIRELESS | |||
| 2356 | config GELIC_WIRELESS_OLD_PSK_INTERFACE | 2357 | config GELIC_WIRELESS_OLD_PSK_INTERFACE |
| 2357 | bool "PS3 Wireless private PSK interface (OBSOLETE)" | 2358 | bool "PS3 Wireless private PSK interface (OBSOLETE)" |
| 2358 | depends on GELIC_WIRELESS | 2359 | depends on GELIC_WIRELESS |
| 2360 | select WEXT_PRIV | ||
| 2359 | help | 2361 | help |
| 2360 | This option retains the obsolete private interface to pass | 2362 | This option retains the obsolete private interface to pass |
| 2361 | the PSK from user space programs to the driver. The PSK | 2363 | the PSK from user space programs to the driver. The PSK |