From 8a978974ee2d4549a9fc958bdbe5f496bafe14c9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 24 Jun 2010 23:00:05 +0200 Subject: [PATCH] compat-wireless: activate iwmc3200wifi and WL1271_SDIO 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 --- config.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config.mk b/config.mk index 04a6f7e4616f..e8ec4582df4e 100644 --- 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 -- 2.30.2