diff options
| author | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:01:48 -0800 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:01:48 -0800 |
| commit | b507d4fd7242d38c7b501387e5681e0299069842 (patch) | |
| tree | a914cbbfe8659b77a99a8b79dc84644ae27fd7ef | |
| parent | 0276b50c0794a0a7d52a38efe2c0909ca7718066 (diff) | |
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 <mcgrof@frijolero.org>
| -rw-r--r-- | patches/08-rename-config-options.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch index 59aef763..8aae093a 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__ |