compat-wireless: activate iwmc3200wifi and WL1271_SDIO
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 24 Jun 2010 21:00:05 +0000 (23:00 +0200)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Fri, 25 Jun 2010 04:09:15 +0000 (21:09 -0700)
netdev_ops for iwmc3200wifi is backported now.
CONFIG_WL1271_SDIO does not depend on ARM any more in mainline, but it
needs at least kernel 2.6.32.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
config.mk

index 04a6f7e4616f1e18662d0dbd493d0df4016ccf9e..e8ec4582df4ebc733261a7fcf580adb17af083c2 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -433,7 +433,7 @@ CONFIG_SSB_SDIOHOST=y
 CONFIG_B43_SDIO=y
 CONFIG_WL1251_SDIO=m
 
-ifneq ($(CONFIG_ARM),)
+ifndef CONFIG_COMPAT_KERNEL_32
 CONFIG_WL1271_SDIO=m
 endif
 
@@ -445,12 +445,8 @@ CONFIG_LIBERTAS_SDIO=m
 NEED_LIBERTAS=y
 endif
 
-# Activate iwmc3200wifi support only on kernel >= 2.6.29.
-# iwmc3200wifi uses new netdev_ops api no supported by old kernel.
-ifndef CONFIG_COMPAT_KERNEL_29
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG=y
-endif
 
 endif # end of SDIO driver list