diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
| commit | ec3ee0969e6ecf49a2c98ce96f6977906ada0553 (patch) | |
| tree | 29f379f37176d854bf3d91746b6e9e683590c6ea /package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch | |
| parent | f79bae2fc011c8ea553c878dc3f0e09ef9b0217a (diff) | |
| download | upstream-ec3ee0969e6ecf49a2c98ce96f6977906ada0553.tar.gz upstream-ec3ee0969e6ecf49a2c98ce96f6977906ada0553.tar.bz2 upstream-ec3ee0969e6ecf49a2c98ce96f6977906ada0553.zip | |
mac80211: update to wireless-testing 2015-10-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47286
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 | 10 |
1 files changed, 5 insertions, 5 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 4fbab23c72..69c9e01d10 100644 --- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch @@ -1,9 +1,9 @@ --- a/.local-symbols +++ b/.local-symbols -@@ -449,43 +449,6 @@ USB_CDC_PHONET= - USB_IPHETH= +@@ -454,43 +454,6 @@ USB_IPHETH= USB_SIERRA_NET= USB_VL600= + USB_NET_CH9200= -SSB_POSSIBLE= -SSB= -SSB_SPROM= @@ -46,7 +46,7 @@ NFC_NCI= --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -2866,7 +2866,7 @@ static struct ssb_device *b43_ssb_gpio_d +@@ -2867,7 +2867,7 @@ static struct ssb_device *b43_ssb_gpio_d { struct ssb_bus *bus = dev->dev->sdev->bus; @@ -55,7 +55,7 @@ return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); #else return bus->chipco.dev; -@@ -4903,7 +4903,7 @@ static int b43_wireless_core_init(struct +@@ -4904,7 +4904,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. */ @@ -120,7 +120,7 @@ --- a/Makefile.kernel +++ b/Makefile.kernel @@ -38,8 +38,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/ - obj-$(CPTCFG_WLAN) += drivers/net/wireless/ + #obj-$(CPTCFG_WLAN += drivers/net/wireless/ obj-$(CPTCFG_BT) += net/bluetooth/ obj-$(CPTCFG_BT) += drivers/bluetooth/ -obj-$(CPTCFG_SSB) += drivers/ssb/ |