From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 11 Aug 2011 10:59:07 +0000 (+0200)
Subject: compat-wireless: do not build libertas_sdio for kernel < 2.6.32
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=15df614469dd150be917dd8b26dae9c054e2ef1a;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: do not build libertas_sdio for kernel < 2.6.32

if_sdio.c needs some new power management functions not available in
older kernel functions. When building for older kernel I get these
compiler errors:

/drivers/net/wireless/libertas/if_sdio.c: In function ‘if_sdio_power_save’:
/drivers/net/wireless/libertas/if_sdio.c:1071:2: error: implicit declaration of function ‘pm_runtime_put_sync’
/drivers/net/wireless/libertas/if_sdio.c: In function ‘if_sdio_power_restore’:
/drivers/net/wireless/libertas/if_sdio.c:1081:2: error: implicit declaration of function ‘pm_runtime_get_sync’
/drivers/net/wireless/libertas/if_sdio.c: In function ‘if_sdio_probe’:
/drivers/net/wireless/libertas/if_sdio.c:1231:2: error: implicit declaration of function ‘pm_runtime_put_noidle’
/drivers/net/wireless/libertas/if_sdio.c: In function ‘if_sdio_remove’:
/drivers/net/wireless/libertas/if_sdio.c:1268:2: error: implicit declaration of function ‘pm_runtime_get_noresume’

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

diff --git a/config.mk b/config.mk
index 27d4daf9965f..e2bffeb227e5 100644
--- a/config.mk
+++ b/config.mk
@@ -555,13 +555,10 @@ endif #CONFIG_CRC7
 
 CONFIG_MWIFIEX_SDIO=m
 
-ifdef CONFIG_COMPAT_KERNEL_2_6_27
-CONFIG_LIBERTAS_SDIO=n
-NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_2_6_27
-CONFIG_LIBERTAS_SDIO=m
+ifndef CONFIG_COMPAT_KERNEL_2_6_32
+CONFIG_COMPAT_LIBERTAS_SDIO=m
 NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_2_6_27
+endif #CONFIG_COMPAT_KERNEL_2_6_32
 
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG=y
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 70ca19099669..55050180ce45 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -59,6 +59,15 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  
  	{0}
  };
+--- a/drivers/net/wireless/libertas/Makefile
++++ b/drivers/net/wireless/libertas/Makefile
+@@ -16,5 +16,5 @@ libertas_spi-objs += if_spi.o
+ obj-$(CONFIG_LIBERTAS)     += libertas.o
+ obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
+ obj-$(CONFIG_LIBERTAS_CS)  += libertas_cs.o
+-obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o
++obj-$(CONFIG_COMPAT_LIBERTAS_SDIO) += libertas_sdio.o
+ obj-$(CONFIG_LIBERTAS_SPI) += libertas_spi.o
 --- a/drivers/net/wireless/zd1211rw/Makefile
 +++ b/drivers/net/wireless/zd1211rw/Makefile
 @@ -1,4 +1,4 @@