diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 10:54:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 10:54:31 +0200 |
| commit | 788c0a53164c05c5ccdb1472474372b72ba74644 (patch) | |
| tree | 5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f /drivers/net/Kconfig | |
| parent | netfilter: {ip,ip6,nfnetlink}_queue: misc cleanups (diff) | |
| parent | libertas: unify various CF-related defines (diff) | |
| download | linux-788c0a53164c05c5ccdb1472474372b72ba74644.tar.xz linux-788c0a53164c05c5ccdb1472474372b72ba74644.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d415d81b5444..654a78c31087 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2284,6 +2284,19 @@ config GELIC_WIRELESS the driver automatically distinguishes the models, you can safely enable this option even if you have a wireless-less model. +config GELIC_WIRELESS_OLD_PSK_INTERFACE + bool "PS3 Wireless private PSK interface (OBSOLETE)" + depends on GELIC_WIRELESS + help + This option retains the obsolete private interface to pass + the PSK from user space programs to the driver. The PSK + stands for 'Pre Shared Key' and is used for WPA[2]-PSK + (WPA-Personal) environment. + If WPA[2]-PSK is used and you need to use old programs that + support only this old interface, say Y. Otherwise N. + + If unsure, say N. + config GIANFAR tristate "Gianfar Ethernet" depends on FSL_SOC |