diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-13 20:25:12 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-13 20:25:12 +0000 |
| commit | 85d36d816d47a441d2c457c550017a90105fd143 (patch) | |
| tree | 50ca2ef254e850b938addae1e14a905d69bab54f | |
| parent | 507f4c6ffaf241abbde6edee8389156e238749ca (diff) | |
mac80211: b43: fix prefix for config options
Config options in backports are starting with CPTCFG and not with CONFIG_.
CONFIG_B43_BCMA was never true.
This closes #13883.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38385 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/mac80211/patches/810-b43_no_pio.patch | 8 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/810-b43_no_pio.patch b/package/kernel/mac80211/patches/810-b43_no_pio.patch index 1206923e0d..5cd1b8bccd 100644 --- a/package/kernel/mac80211/patches/810-b43_no_pio.patch +++ b/package/kernel/mac80211/patches/810-b43_no_pio.patch @@ -5,7 +5,7 @@ b43-y += wa.o b43-y += dma.o -b43-y += pio.o -+b43-$(CONFIG_B43_PIO) += pio.o ++b43-$(CPTCFG_B43_PIO) += pio.o b43-y += rfkill.o b43-$(CPTCFG_B43_LEDS) += leds.o b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o @@ -15,7 +15,7 @@ dma_reason[0], dma_reason[1], dma_reason[2], dma_reason[3], dma_reason[4], dma_reason[5]); -+#ifdef CONFIG_B43_PIO ++#ifdef CPTCFG_B43_PIO b43err(dev->wl, "This device does not support DMA " "on your system. It will now be switched to PIO.\n"); /* Fall back to PIO transfers if we get fatal DMA errors! */ @@ -31,7 +31,7 @@ } - -+#ifdef CONFIG_B43_PIO ++#ifdef CPTCFG_B43_PIO int b43_pio_init(struct b43_wldev *dev); void b43_pio_free(struct b43_wldev *dev); @@ -70,7 +70,7 @@ +static inline void b43_pio_tx_resume(struct b43_wldev *dev) +{ +} -+#endif /* CONFIG_B43_PIO */ ++#endif /* CPTCFG_B43_PIO */ #endif /* B43_PIO_H_ */ --- a/drivers/net/wireless/b43/Kconfig diff --git a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch index e55d4fe4aa..c039f41451 100644 --- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch +++ b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch @@ -62,7 +62,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +{ + if (dev->bus_type == B43_BUS_SSB) + return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI); -+#ifdef CONFIG_B43_BCMA ++#ifdef CPTCFG_B43_BCMA + if (dev->bus_type == B43_BUS_BCMA) + return (dev->bdev->bus->hosttype == BCMA_HOSTTYPE_PCI); +#endif |