diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
| commit | 9f5dba18e9a1a3716dd805702195521d32e385ca (patch) | |
| tree | bff917861075b930a7cc3b520f0371ecdcddcdc8 /package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch | |
| parent | 61cd5ce994701218a033578d2174e4791c146771 (diff) | |
| download | upstream-9f5dba18e9a1a3716dd805702195521d32e385ca.tar.gz upstream-9f5dba18e9a1a3716dd805702195521d32e385ca.tar.bz2 upstream-9f5dba18e9a1a3716dd805702195521d32e385ca.zip | |
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net>
Also update mt76 to update for API changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44655 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch index cd6e31fd1b..d3079491dc 100644 --- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch @@ -1,6 +1,6 @@ --- a/.local-symbols +++ b/.local-symbols -@@ -423,42 +423,6 @@ USB_CDC_PHONET= +@@ -344,40 +344,3 @@ USB_CDC_PHONET= USB_IPHETH= USB_SIERRA_NET= USB_VL600= @@ -34,41 +34,27 @@ -BCMA_HOST_PCI= -BCMA_DRIVER_PCI_HOSTMODE= -BCMA_HOST_SOC= +-BCMA_DRIVER_PCI= -BCMA_DRIVER_MIPS= -BCMA_SFLASH= -BCMA_NFLASH= -BCMA_DRIVER_GMAC_CMN= -BCMA_DRIVER_GPIO= -BCMA_DEBUG= - NFC= - NFC_DIGITAL= - NFC_NCI= ---- a/Kconfig -+++ b/Kconfig -@@ -33,9 +33,6 @@ source drivers/net/wireless/Kconfig - source drivers/net/ethernet/Kconfig - source drivers/net/usb/Kconfig - --source drivers/ssb/Kconfig --source drivers/bcma/Kconfig -- - source net/nfc/Kconfig - - source drivers/media/Kconfig --- a/Makefile.kernel +++ b/Makefile.kernel -@@ -25,8 +25,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/ +@@ -38,8 +38,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ - obj-$(CPTCFG_BT) += net/bluetooth/ - obj-$(CPTCFG_BT) += drivers/bluetooth/ + #obj-$(CPTCFG_BT) += net/bluetooth/ + #obj-$(CPTCFG_BT) += drivers/bluetooth/ -obj-$(CPTCFG_SSB) += drivers/ssb/ -obj-$(CPTCFG_BCMA) += drivers/bcma/ - obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/ + #obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ - obj-$(CPTCFG_NFC) += net/nfc/ + #obj-$(CPTCFG_NFC) += net/nfc/ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -2828,7 +2828,7 @@ static struct ssb_device *b43_ssb_gpio_d +@@ -2866,7 +2866,7 @@ static struct ssb_device *b43_ssb_gpio_d { struct ssb_bus *bus = dev->dev->sdev->bus; @@ -77,7 +63,7 @@ return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); #else return bus->chipco.dev; -@@ -4858,7 +4858,7 @@ static int b43_wireless_core_init(struct +@@ -4907,7 +4907,7 @@ static int b43_wireless_core_init(struct } if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW) hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */ @@ -127,3 +113,15 @@ void brcms_led_unregister(struct brcms_info *wl); int brcms_led_register(struct brcms_info *wl); #else +--- a/Kconfig.sources ++++ b/Kconfig.sources +@@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele + #source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig" + source "$BACKPORT_DIR/drivers/net/usb/Kconfig" + +-source "$BACKPORT_DIR/drivers/ssb/Kconfig" +-source "$BACKPORT_DIR/drivers/bcma/Kconfig" +- + #source "$BACKPORT_DIR/net/nfc/Kconfig" + + #source "$BACKPORT_DIR/drivers/media/Kconfig" |