diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/net/Kconfig | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 | |||
| 2346 | 2346 | ||
| 2347 | config GELIC_WIRELESS | 2347 | config GELIC_WIRELESS |
| 2348 | bool "PS3 Wireless support" | 2348 | bool "PS3 Wireless support" |
| 2349 | depends on WLAN | ||
| 2349 | depends on GELIC_NET | 2350 | depends on GELIC_NET |
| 2350 | select WIRELESS_EXT | 2351 | select WIRELESS_EXT |
| 2351 | help | 2352 | help |
| @@ -2358,6 +2359,7 @@ config GELIC_WIRELESS | |||
| 2358 | config GELIC_WIRELESS_OLD_PSK_INTERFACE | 2359 | config GELIC_WIRELESS_OLD_PSK_INTERFACE |
| 2359 | bool "PS3 Wireless private PSK interface (OBSOLETE)" | 2360 | bool "PS3 Wireless private PSK interface (OBSOLETE)" |
| 2360 | depends on GELIC_WIRELESS | 2361 | depends on GELIC_WIRELESS |
| 2362 | select WEXT_PRIV | ||
| 2361 | help | 2363 | help |
| 2362 | This option retains the obsolete private interface to pass | 2364 | This option retains the obsolete private interface to pass |
| 2363 | the PSK from user space programs to the driver. The PSK | 2365 | the PSK from user space programs to the driver. The PSK |