compat-wireless: deactivate wl1251 for kernel < 2.6.37

wl1251_sdio and wl1251_spi are depending on irq_set_status_flags() since

commit f380f2c4a12e913356bd49f8790ec1063c4fe9f8
Author: Grazvydas Ignotas <notasas@gmail.com>
Date:   Fri May 18 03:04:08 2012 +0300

    wl1251: fix oops on early interrupt

irq_set_status_flags() was added to the kernel in version 2.6.37 and
backporting it is hard, so do not build wl1251_sdio and wl1251_spi for
older kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/config.mk b/config.mk
index 3caebc4c9952fd530fd820bbbeebb28a5ca23fdf..bc0296fab6934a5665a401502b234082a8a24c50 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -556,7 +556,9 @@ ifdef CONFIG_SPI_MASTER
 ifndef CONFIG_COMPAT_KERNEL_2_6_25
 
 ifdef CONFIG_CRC7
-export CONFIG_WL1251_SPI=m
+ifndef CONFIG_COMPAT_KERNEL_2_6_37
+export CONFIG_COMPAT_WL1251_SPI=m
+endif #CONFIG_COMPAT_KERNEL_2_6_37
 export CONFIG_WLCORE_SPI=m
 endif #CONFIG_CRC7
 export CONFIG_P54_SPI=m
@@ -579,7 +581,9 @@ export CONFIG_B43_SDIO=y
 
 ifdef CONFIG_CRC7
 ifdef CONFIG_WL12XX_PLATFORM_DATA
+ifndef CONFIG_COMPAT_KERNEL_2_6_37
 export CONFIG_COMPAT_WL1251_SDIO=m
+endif #CONFIG_COMPAT_KERNEL_2_6_37
 export CONFIG_WLCORE_SDIO=m
 endif #CONFIG_WL12XX_PLATFORM_DATA
 endif #CONFIG_CRC7

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index ecce8920807a8cd458bbeb85c8abaf9f5a3ea2d0..f8d459abfdfec92d871dad4c408b591e89faeeb4 100644 (file)
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -92,11 +92,13 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  hidp-objs := core.o sock.o
 --- a/drivers/net/wireless/ti/wl1251/Makefile
 +++ b/drivers/net/wireless/ti/wl1251/Makefile
-@@ -5,6 +5,6 @@ wl1251_sdio-objs       += sdio.o
+@@ -4,7 +4,7 @@ wl1251_spi-objs                += spi.o
+ wl1251_sdio-objs      += sdio.o
  
  obj-$(CONFIG_WL1251)          += wl1251.o
- obj-$(CONFIG_WL1251_SPI)      += wl1251_spi.o
+-obj-$(CONFIG_WL1251_SPI)      += wl1251_spi.o
 -obj-$(CONFIG_WL1251_SDIO)     += wl1251_sdio.o
++obj-$(CONFIG_COMPAT_WL1251_SPI)+= wl1251_spi.o
 +obj-$(CONFIG_COMPAT_WL1251_SDIO)+= wl1251_sdio.o
  
  ccflags-y += -D__CHECK_ENDIAN__