diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
| commit | 10be7eb36b93364b98688831ee7d26f58402bb96 (patch) | |
| tree | eb13ae80fcaa8baacd804a721c5a4962a501a2a4 /drivers/net/Kconfig | |
| parent | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (diff) | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 411e20703110..ef662e15c3d3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2368,20 +2368,6 @@ 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 - select WEXT_PRIV - 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 FSL_PQ_MDIO tristate "Freescale PQ MDIO" depends on FSL_SOC |