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

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