compat-wireless: fix compilation warning for wl12xx

This should fix this compilation:

  MODPOST 32 modules
WARNING: "wl12xx_get_platform_data"
[/home/mcgrof/tmp/compat/compat-wireless-2.6.39-rc1-2-s/drivers/net/wireless/wl1251/wl1251_sdio.ko] undefined!

This is caused because CONFIG_WL12XX is defined on older
kernels and we need to depend on the platform data
(CONFIG_WL12XX_PLATFORM_DATA) to build CONFIG_WL12XX_SDIO.
Since we cannot disable a config option just rename the config
option.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/config.mk b/config.mk
index dd6aa60f2278a4be372173d61563e824c8757ca8..92b5fad936b1cf017c48e369088d9d0a229e56b6 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -497,7 +497,7 @@ ifndef CONFIG_COMPAT_KERNEL_25
 
 ifdef CONFIG_CRC7
 CONFIG_WL1251_SPI=m
-CONFIG_WL12XX_SPI=m
+CONFIG_COMPAT_WL12XX_SPI=m
 endif #CONFIG_CRC7
 CONFIG_P54_SPI=m
 
@@ -524,7 +524,7 @@ endif #CONFIG_WL12XX_PLATFORM_DATA
 
 ifndef CONFIG_COMPAT_KERNEL_32
 ifdef CONFIG_WL12XX_PLATFORM_DATA
-CONFIG_WL12XX_SDIO=m
+CONFIG_COMPAT_WL12XX_SDIO=m
 endif #CONFIG_WL12XX_PLATFORM_DATA
 endif #CONFIG_COMPAT_KERNEL_32
 
@@ -605,7 +605,7 @@ CONFIG_ATH_COMMON=m
 
 ifdef CONFIG_CRC7
 CONFIG_WL1251=m
-CONFIG_WL12XX=m
+CONFIG_COMPAT_WL12XX=m
 CONFIG_WL12XX_HT=y
 endif #CONFIG_CRC7
 

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 16f788e8821efa92947b4055fc0fae8a25ea154a..3232b400d64eb751ee9b09eaa5c44d4e8145a771 100644 (file)
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -111,3 +111,21 @@ CONFIG_BT_HIDP does not build with older kernel versions.
 +obj-$(CONFIG_COMPAT_BT_HIDP) += hidp.o
  
  hidp-objs := core.o sock.o
+--- a/drivers/net/wireless/wl12xx/Makefile
++++ b/drivers/net/wireless/wl12xx/Makefile
+@@ -6,11 +6,11 @@
+ wl12xx_sdio_test-objs = sdio_test.o
+ 
+ wl12xx-$(CONFIG_NL80211_TESTMODE)     += testmode.o
+-obj-$(CONFIG_WL12XX)                  += wl12xx.o
+-obj-$(CONFIG_WL12XX_SPI)              += wl12xx_spi.o
+-obj-$(CONFIG_WL12XX_SDIO)             += wl12xx_sdio.o
++obj-$(CONFIG_COMPAT_WL12XX)                   += wl12xx.o
++obj-$(CONFIG_COMPAT_WL12XX_SPI)               += wl12xx_spi.o
++obj-$(CONFIG_COMPAT_WL12XX_SDIO)              += wl12xx_sdio.o
+ 
+-obj-$(CONFIG_WL12XX_SDIO_TEST)        += wl12xx_sdio_test.o
++obj-$(CONFIG_COMPAT_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
+ 
+ # small builtin driver bit
+ obj-$(CONFIG_WL12XX_PLATFORM_DATA)    += wl12xx_platform_data.o