This deactivate the wl1271_sdio driver, because it needs wl12xx_platform_data.c directly compiled into the kernel. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- config.mk | 2 ++ scripts/admin-update.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/config.mk b/config.mk index de5766f..19ea6b2 100644 --- a/config.mk +++ b/config.mk @@ -485,7 +485,9 @@ ifdef CONFIG_CRC7 CONFIG_WL1251_SDIO=m ifndef CONFIG_COMPAT_KERNEL_32 +ifdef CONFIG_WL12XX_PLATFORM_DATA CONFIG_WL1271_SDIO=m +endif #CONFIG_WL12XX_PLATFORM_DATA endif #CONFIG_COMPAT_KERNEL_32 endif #CONFIG_CRC7 diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index ac9470d..91722f3 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -24,11 +24,12 @@ NET_BT_DIRS="bluetooth bluetooth/bnep bluetooth/cmtp bluetooth/rfcomm bluetooth/ INCLUDE_LINUX="ieee80211.h nl80211.h" INCLUDE_LINUX="$INCLUDE_LINUX pci_ids.h eeprom_93cx6.h" INCLUDE_LINUX="$INCLUDE_LINUX ath9k_platform.h" +INCLUDE_LINUX="$INCLUDE_LINUX wl12xx.h" # For rndis_wext INCLUDE_LINUX_USB="usbnet.h rndis_host.h" -INCLUDE_LINUX_SPI="wl12xx.h libertas_spi.h" +INCLUDE_LINUX_SPI="libertas_spi.h" # The good new yummy stuff INCLUDE_NET="cfg80211.h ieee80211_radiotap.h" -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
