diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /drivers/net/wireless/iwlwifi/Kconfig | |
parent | [ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. (diff) | |
parent | [ARM] Orion: clean up addr-map.c after window setting code purge (diff) | |
download | linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.tar.xz linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Kconfig')
-rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index d5b7a76fcaad..62fb89d82318 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig @@ -1,6 +1,5 @@ config IWLWIFI - bool - default n + tristate config IWLCORE tristate "Intel Wireless Wifi Core" |