diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
commit | 0747f7716e6bf96483922904ee14936353865c52 (patch) | |
tree | fde20e508d2671990f77686e0e7e968f8fdb9921 /drivers/staging/wlan-ng/Kconfig | |
parent | e5befd178b2168a6e538fd118cc11be34fadabdc (diff) | |
parent | bf2ac280f2478de0aed46e851060d3c0fce3674b (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/wlan-ng/Kconfig')
-rw-r--r-- | drivers/staging/wlan-ng/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig index f44294b0d8dc..82fcc1665e92 100644 --- a/drivers/staging/wlan-ng/Kconfig +++ b/drivers/staging/wlan-ng/Kconfig @@ -1,6 +1,8 @@ config PRISM2_USB tristate "Prism2.5/3 USB driver" - depends on WLAN && USB && WIRELESS_EXT + depends on WLAN && USB + select WIRELESS_EXT + select WEXT_PRIV default n ---help--- This is the wlan-ng prism 2.5/3 USB driver for a wide range of |