From: Luis R. Rodriguez Date: Thu, 23 Feb 2012 23:01:48 +0000 (-0800) Subject: compat-wireless: fix 08-rename-config-options.patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b507d4fd7242d38c7b501387e5681e0299069842;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: fix 08-rename-config-options.patch Hunk conflicts due to changes on the Makefile for the wl1251 driver. Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch index 59aef76342b7..8aae093af4af 100644 --- a/patches/08-rename-config-options.patch +++ b/patches/08-rename-config-options.patch @@ -95,9 +95,11 @@ CONFIG_BT_HIDP does not build with older kernel versions. obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o --- a/drivers/net/wireless/wl1251/Makefile +++ b/drivers/net/wireless/wl1251/Makefile -@@ -5,4 +5,4 @@ wl1251_sdio-objs += sdio.o +@@ -5,6 +5,6 @@ wl1251_sdio-objs += sdio.o obj-$(CONFIG_WL1251) += wl1251.o obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o -obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o +obj-$(CONFIG_COMPAT_WL1251_SDIO) += wl1251_sdio.o + + ccflags-y += -D__CHECK_ENDIAN__