mac80211: update to wireless-testing 2015-10-26
[openwrt.git] / package / kernel / mac80211 / patches / 060-no_local_ssb_bcma.patch
1 --- a/.local-symbols
2 +++ b/.local-symbols
3 @@ -454,43 +454,6 @@ USB_IPHETH=
4  USB_SIERRA_NET=
5  USB_VL600=
6  USB_NET_CH9200=
7 -SSB_POSSIBLE=
8 -SSB=
9 -SSB_SPROM=
10 -SSB_BLOCKIO=
11 -SSB_PCIHOST_POSSIBLE=
12 -SSB_PCIHOST=
13 -SSB_B43_PCI_BRIDGE=
14 -SSB_PCMCIAHOST_POSSIBLE=
15 -SSB_PCMCIAHOST=
16 -SSB_SDIOHOST_POSSIBLE=
17 -SSB_SDIOHOST=
18 -SSB_SILENT=
19 -SSB_DEBUG=
20 -SSB_SERIAL=
21 -SSB_DRIVER_PCICORE_POSSIBLE=
22 -SSB_DRIVER_PCICORE=
23 -SSB_PCICORE_HOSTMODE=
24 -SSB_DRIVER_MIPS=
25 -SSB_SFLASH=
26 -SSB_EMBEDDED=
27 -SSB_DRIVER_EXTIF=
28 -SSB_DRIVER_GIGE=
29 -SSB_DRIVER_GPIO=
30 -BCMA_POSSIBLE=
31 -BCMA=
32 -BCMA_BLOCKIO=
33 -BCMA_HOST_PCI_POSSIBLE=
34 -BCMA_HOST_PCI=
35 -BCMA_HOST_SOC=
36 -BCMA_DRIVER_PCI=
37 -BCMA_DRIVER_PCI_HOSTMODE=
38 -BCMA_DRIVER_MIPS=
39 -BCMA_SFLASH=
40 -BCMA_NFLASH=
41 -BCMA_DRIVER_GMAC_CMN=
42 -BCMA_DRIVER_GPIO=
43 -BCMA_DEBUG=
44  NFC=
45  NFC_DIGITAL=
46  NFC_NCI=
47 --- a/drivers/net/wireless/b43/main.c
48 +++ b/drivers/net/wireless/b43/main.c
49 @@ -2867,7 +2867,7 @@ static struct ssb_device *b43_ssb_gpio_d
50  {
51         struct ssb_bus *bus = dev->dev->sdev->bus;
52  
53 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
54 +#ifdef CONFIG_SSB_DRIVER_PCICORE
55         return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
56  #else
57         return bus->chipco.dev;
58 @@ -4904,7 +4904,7 @@ static int b43_wireless_core_init(struct
59         }
60         if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
61                 hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
62 -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
63 +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
64         if (dev->dev->bus_type == B43_BUS_SSB &&
65             dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
66             dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
67 --- a/drivers/net/wireless/b43legacy/main.c
68 +++ b/drivers/net/wireless/b43legacy/main.c
69 @@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
70         if (dev->dev->id.revision >= 2)
71                 mask  |= 0x0010; /* FIXME: This is redundant. */
72  
73 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
74 +#ifdef CONFIG_SSB_DRIVER_PCICORE
75         pcidev = bus->pcicore.dev;
76  #endif
77         gpiodev = bus->chipco.dev ? : pcidev;
78 @@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
79         struct ssb_bus *bus = dev->dev->bus;
80         struct ssb_device *gpiodev, *pcidev = NULL;
81  
82 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
83 +#ifdef CONFIG_SSB_DRIVER_PCICORE
84         pcidev = bus->pcicore.dev;
85  #endif
86         gpiodev = bus->chipco.dev ? : pcidev;
87 --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
88 +++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
89 @@ -43,6 +43,6 @@ brcmsmac-y := \
90         brcms_trace_events.o \
91         debug.o
92  
93 -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
94 +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
95  
96  obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
97 --- a/drivers/net/wireless/brcm80211/brcmsmac/led.h
98 +++ b/drivers/net/wireless/brcm80211/brcmsmac/led.h
99 @@ -22,7 +22,7 @@ struct brcms_led {
100         bool active_low;
101  };
102  
103 -#ifdef CPTCFG_BCMA_DRIVER_GPIO
104 +#ifdef CONFIG_BCMA_DRIVER_GPIO
105  void brcms_led_unregister(struct brcms_info *wl);
106  int brcms_led_register(struct brcms_info *wl);
107  #else
108 --- a/Kconfig.sources
109 +++ b/Kconfig.sources
110 @@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele
111  source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
112  source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
113  
114 -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
115 -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
116 -
117  source "$BACKPORT_DIR/net/nfc/Kconfig"
118  
119  source "$BACKPORT_DIR/drivers/media/Kconfig"
120 --- a/Makefile.kernel
121 +++ b/Makefile.kernel
122 @@ -38,8 +38,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
123  #obj-$(CPTCFG_WLAN += drivers/net/wireless/
124  obj-$(CPTCFG_BT) += net/bluetooth/
125  obj-$(CPTCFG_BT) += drivers/bluetooth/
126 -obj-$(CPTCFG_SSB) += drivers/ssb/
127 -obj-$(CPTCFG_BCMA) += drivers/bcma/
128  obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
129  obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
130  obj-$(CPTCFG_NFC) += net/nfc/