diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
| commit | dba9532388b00d591d87c638a47dcc7ba3763fc5 (patch) | |
| tree | cc9de8cbc40d0e927b1924d1d943208e84e21d1f /drivers/net/Kconfig | |
| parent | 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d (diff) | |
| parent | c68db7175f4dcb3d5789bb50bea6376fb81f87fe (diff) | |
Merge remote branch 'alsa/fixes' into fix/misc
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 |