package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch

   1 --- a/local-symbols
   2 +++ b/local-symbols
   3 @@ -491,43 +491,6 @@ USB_VL600=
   4  USB_NET_CH9200=
   5  USB_NET_AQC111=
   6  USB_RTL8153_ECM=
   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_HOST_SOC=
  19 -SSB_SERIAL=
  20 -SSB_DRIVER_PCICORE_POSSIBLE=
  21 -SSB_DRIVER_PCICORE=
  22 -SSB_PCICORE_HOSTMODE=
  23 -SSB_DRIVER_MIPS=
  24 -SSB_SFLASH=
  25 -SSB_EMBEDDED=
  26 -SSB_DRIVER_EXTIF=
  27 -SSB_DRIVER_GIGE=
  28 -SSB_DRIVER_GPIO=
  29 -BCMA_POSSIBLE=
  30 -BCMA=
  31 -BCMA_BLOCKIO=
  32 -BCMA_HOST_PCI_POSSIBLE=
  33 -BCMA_HOST_PCI=
  34 -BCMA_HOST_SOC=
  35 -BCMA_DRIVER_PCI=
  36 -BCMA_DRIVER_PCI_HOSTMODE=
  37 -BCMA_DRIVER_MIPS=
  38 -BCMA_PFLASH=
  39 -BCMA_SFLASH=
  40 -BCMA_NFLASH=
  41 -BCMA_DRIVER_GMAC_CMN=
  42 -BCMA_DRIVER_GPIO=
  43 -BCMA_DEBUG=
  44  USB_ACM=
  45  USB_PRINTER=
  46  USB_WDM=
  47 --- a/drivers/net/wireless/broadcom/b43/Kconfig
  48 +++ b/drivers/net/wireless/broadcom/b43/Kconfig
  49 @@ -63,21 +63,21 @@ endchoice
  50  config B43_PCI_AUTOSELECT
  51         bool
  52         depends on B43 && SSB_PCIHOST_POSSIBLE
  53 -       select SSB_PCIHOST
  54 -       select SSB_B43_PCI_BRIDGE
  55 +       depends on SSB_PCIHOST
  56 +       depends on SSB_B43_PCI_BRIDGE
  57         default y
  58
  59  # Auto-select SSB PCICORE driver, if possible
  60  config B43_PCICORE_AUTOSELECT
  61         bool
  62         depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE
  63 -       select SSB_DRIVER_PCICORE
  64 +       depends on SSB_DRIVER_PCICORE
  65         default y
  66
  67  config B43_SDIO
  68         bool "Broadcom 43xx SDIO device support"
  69         depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
  70 -       select SSB_SDIOHOST
  71 +       depends on SSB_SDIOHOST
  72         help
  73           Broadcom 43xx device support for Soft-MAC SDIO devices.
  74
  75 @@ -96,13 +96,13 @@ config B43_SDIO
  76  config B43_BCMA_PIO
  77         bool
  78         depends on B43 && B43_BCMA
  79 -       select BCMA_BLOCKIO
  80 +       depends on BCMA_BLOCKIO
  81         default y
  82
  83  config B43_PIO
  84         bool
  85         depends on B43 && B43_SSB
  86 -       select SSB_BLOCKIO
  87 +       depends on SSB_BLOCKIO
  88         default y
  89
  90  config B43_PHY_G
  91 --- a/drivers/net/wireless/broadcom/b43/main.c
  92 +++ b/drivers/net/wireless/broadcom/b43/main.c
  93 @@ -2853,7 +2853,7 @@ static struct ssb_device *b43_ssb_gpio_d
  94  {
  95         struct ssb_bus *bus = dev->dev->sdev->bus;
  96
  97 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  98 +#ifdef CONFIG_SSB_DRIVER_PCICORE
  99         return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
 100  #else
 101         return bus->chipco.dev;
 102 @@ -4871,7 +4871,7 @@ static int b43_wireless_core_init(struct
 103         }
 104         if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
 105                 hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
 106 -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
 107 +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
 108         if (dev->dev->bus_type == B43_BUS_SSB &&
 109             dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
 110             dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
 111 --- a/drivers/net/wireless/broadcom/b43legacy/Kconfig
 112 +++ b/drivers/net/wireless/broadcom/b43legacy/Kconfig
 113 @@ -3,7 +3,7 @@ config B43LEGACY
 114         tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)"
 115         depends on m
 116         depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
 117 -       select SSB
 118 +       depends on SSB
 119         depends on FW_LOADER
 120         help
 121           b43legacy is a driver for 802.11b devices from Broadcom (BCM4301 and
 122 @@ -25,15 +25,15 @@ config B43LEGACY
 123  config B43LEGACY_PCI_AUTOSELECT
 124         bool
 125         depends on B43LEGACY && SSB_PCIHOST_POSSIBLE
 126 -       select SSB_PCIHOST
 127 -       select SSB_B43_PCI_BRIDGE
 128 +       depends on SSB_PCIHOST
 129 +       depends on SSB_B43_PCI_BRIDGE
 130         default y
 131
 132  # Auto-select SSB PCICORE driver, if possible
 133  config B43LEGACY_PCICORE_AUTOSELECT
 134         bool
 135         depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE
 136 -       select SSB_DRIVER_PCICORE
 137 +       depends on SSB_DRIVER_PCICORE
 138         default y
 139
 140  # LED support
 141 --- a/drivers/net/wireless/broadcom/b43legacy/main.c
 142 +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
 143 @@ -1907,7 +1907,7 @@ static int b43legacy_gpio_init(struct b4
 144         if (dev->dev->id.revision >= 2)
 145                 mask  |= 0x0010; /* FIXME: This is redundant. */
 146
 147 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
 148 +#ifdef CONFIG_SSB_DRIVER_PCICORE
 149         pcidev = bus->pcicore.dev;
 150  #endif
 151         gpiodev = bus->chipco.dev ? : pcidev;
 152 @@ -1926,7 +1926,7 @@ static void b43legacy_gpio_cleanup(struc
 153         struct ssb_bus *bus = dev->dev->bus;
 154         struct ssb_device *gpiodev, *pcidev = NULL;
 155
 156 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
 157 +#ifdef CONFIG_SSB_DRIVER_PCICORE
 158         pcidev = bus->pcicore.dev;
 159  #endif
 160         gpiodev = bus->chipco.dev ? : pcidev;
 161 --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
 162 +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
 163 @@ -8,7 +8,7 @@ config BRCMSMAC
 164         depends on m
 165         depends on MAC80211
 166         depends on BCMA_POSSIBLE
 167 -       select BCMA
 168 +       depends on BCMA
 169         select BRCMUTIL
 170         depends on FW_LOADER
 171         depends on CORDIC
 172 --- a/Kconfig.local
 173 +++ b/Kconfig.local
 174 @@ -1477,117 +1477,6 @@ config BACKPORTED_USB_NET_AQC111
 175  config BACKPORTED_USB_RTL8153_ECM
 176         tristate
 177         default USB_RTL8153_ECM
 178 -config BACKPORTED_SSB_POSSIBLE
 179 -       tristate
 180 -       default SSB_POSSIBLE
 181 -config BACKPORTED_SSB
 182 -       tristate
 183 -       default SSB
 184 -config BACKPORTED_SSB_SPROM
 185 -       tristate
 186 -       default SSB_SPROM
 187 -config BACKPORTED_SSB_BLOCKIO
 188 -       tristate
 189 -       default SSB_BLOCKIO
 190 -config BACKPORTED_SSB_PCIHOST_POSSIBLE
 191 -       tristate
 192 -       default SSB_PCIHOST_POSSIBLE
 193 -config BACKPORTED_SSB_PCIHOST
 194 -       tristate
 195 -       default SSB_PCIHOST
 196 -config BACKPORTED_SSB_B43_PCI_BRIDGE
 197 -       tristate
 198 -       default SSB_B43_PCI_BRIDGE
 199 -config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE
 200 -       tristate
 201 -       default SSB_PCMCIAHOST_POSSIBLE
 202 -config BACKPORTED_SSB_PCMCIAHOST
 203 -       tristate
 204 -       default SSB_PCMCIAHOST
 205 -config BACKPORTED_SSB_SDIOHOST_POSSIBLE
 206 -       tristate
 207 -       default SSB_SDIOHOST_POSSIBLE
 208 -config BACKPORTED_SSB_SDIOHOST
 209 -       tristate
 210 -       default SSB_SDIOHOST
 211 -config BACKPORTED_SSB_HOST_SOC
 212 -       tristate
 213 -       default SSB_HOST_SOC
 214 -config BACKPORTED_SSB_SERIAL
 215 -       tristate
 216 -       default SSB_SERIAL
 217 -config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE
 218 -       tristate
 219 -       default SSB_DRIVER_PCICORE_POSSIBLE
 220 -config BACKPORTED_SSB_DRIVER_PCICORE
 221 -       tristate
 222 -       default SSB_DRIVER_PCICORE
 223 -config BACKPORTED_SSB_PCICORE_HOSTMODE
 224 -       tristate
 225 -       default SSB_PCICORE_HOSTMODE
 226 -config BACKPORTED_SSB_DRIVER_MIPS
 227 -       tristate
 228 -       default SSB_DRIVER_MIPS
 229 -config BACKPORTED_SSB_SFLASH
 230 -       tristate
 231 -       default SSB_SFLASH
 232 -config BACKPORTED_SSB_EMBEDDED
 233 -       tristate
 234 -       default SSB_EMBEDDED
 235 -config BACKPORTED_SSB_DRIVER_EXTIF
 236 -       tristate
 237 -       default SSB_DRIVER_EXTIF
 238 -config BACKPORTED_SSB_DRIVER_GIGE
 239 -       tristate
 240 -       default SSB_DRIVER_GIGE
 241 -config BACKPORTED_SSB_DRIVER_GPIO
 242 -       tristate
 243 -       default SSB_DRIVER_GPIO
 244 -config BACKPORTED_BCMA_POSSIBLE
 245 -       tristate
 246 -       default BCMA_POSSIBLE
 247 -config BACKPORTED_BCMA
 248 -       tristate
 249 -       default BCMA
 250 -config BACKPORTED_BCMA_BLOCKIO
 251 -       tristate
 252 -       default BCMA_BLOCKIO
 253 -config BACKPORTED_BCMA_HOST_PCI_POSSIBLE
 254 -       tristate
 255 -       default BCMA_HOST_PCI_POSSIBLE
 256 -config BACKPORTED_BCMA_HOST_PCI
 257 -       tristate
 258 -       default BCMA_HOST_PCI
 259 -config BACKPORTED_BCMA_HOST_SOC
 260 -       tristate
 261 -       default BCMA_HOST_SOC
 262 -config BACKPORTED_BCMA_DRIVER_PCI
 263 -       tristate
 264 -       default BCMA_DRIVER_PCI
 265 -config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE
 266 -       tristate
 267 -       default BCMA_DRIVER_PCI_HOSTMODE
 268 -config BACKPORTED_BCMA_DRIVER_MIPS
 269 -       tristate
 270 -       default BCMA_DRIVER_MIPS
 271 -config BACKPORTED_BCMA_PFLASH
 272 -       tristate
 273 -       default BCMA_PFLASH
 274 -config BACKPORTED_BCMA_SFLASH
 275 -       tristate
 276 -       default BCMA_SFLASH
 277 -config BACKPORTED_BCMA_NFLASH
 278 -       tristate
 279 -       default BCMA_NFLASH
 280 -config BACKPORTED_BCMA_DRIVER_GMAC_CMN
 281 -       tristate
 282 -       default BCMA_DRIVER_GMAC_CMN
 283 -config BACKPORTED_BCMA_DRIVER_GPIO
 284 -       tristate
 285 -       default BCMA_DRIVER_GPIO
 286 -config BACKPORTED_BCMA_DEBUG
 287 -       tristate
 288 -       default BCMA_DEBUG
 289  config BACKPORTED_USB_ACM
 290         tristate
 291         default USB_ACM
 292 --- a/Kconfig.sources
 293 +++ b/Kconfig.sources
 294 @@ -10,9 +10,6 @@ source "$BACKPORT_DIR/drivers/soc/qcom/K
 295  source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
 296  source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
 297
 298 -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
 299 -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
 300 -
 301  source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
 302
 303  source "$BACKPORT_DIR/drivers/staging/Kconfig"
 304 --- a/Makefile.kernel
 305 +++ b/Makefile.kernel
 306 @@ -43,8 +43,6 @@ obj-$(CPTCFG_QRTR) += net/qrtr/
 307  obj-$(CPTCFG_QCOM_QMI_HELPERS) += drivers/soc/qcom/
 308  obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
 309  obj-$(CPTCFG_WLAN) += drivers/net/wireless/
 310 -obj-$(CPTCFG_SSB) += drivers/ssb/
 311 -obj-$(CPTCFG_BCMA) += drivers/bcma/
 312  obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
 313
 314  obj-$(CPTCFG_USB_WDM) += drivers/usb/class/