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 27d4daf9965f11a4840d4e4459138cde6810ca67..e2bffeb227e567f07607f11fe4696fe328a5cde9 100644 (file)
--- 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 70ca1909966993846f2844efe6b41cf06168e852..55050180ce45611bc9650fc37ee0d7bc0f250ba5 100644 (file)
--- 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 @@