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

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