diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /drivers/net/Kconfig | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
Merge 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 0bbd5ae49862..18ff622703be 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 |