3 @@ -388,45 +388,6 @@ USB_IPHETH=
11 -SSB_PCIHOST_POSSIBLE=
14 -SSB_PCMCIAHOST_POSSIBLE=
16 -SSB_SDIOHOST_POSSIBLE=
22 -SSB_DRIVER_PCICORE_POSSIBLE=
24 -SSB_PCICORE_HOSTMODE=
34 -BCMA_HOST_PCI_POSSIBLE=
38 -BCMA_DRIVER_PCI_HOSTMODE=
43 -BCMA_DRIVER_GMAC_CMN=
49 --- a/drivers/net/wireless/broadcom/b43/main.c
50 +++ b/drivers/net/wireless/broadcom/b43/main.c
51 @@ -2876,7 +2876,7 @@ static struct ssb_device *b43_ssb_gpio_d
53 struct ssb_bus *bus = dev->dev->sdev->bus;
55 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
56 +#ifdef CONFIG_SSB_DRIVER_PCICORE
57 return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
59 return bus->chipco.dev;
60 @@ -4893,7 +4893,7 @@ static int b43_wireless_core_init(struct
62 if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
63 hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
64 -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
65 +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
66 if (dev->dev->bus_type == B43_BUS_SSB &&
67 dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
68 dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
69 --- a/drivers/net/wireless/broadcom/b43legacy/main.c
70 +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
71 @@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
72 if (dev->dev->id.revision >= 2)
73 mask |= 0x0010; /* FIXME: This is redundant. */
75 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
76 +#ifdef CONFIG_SSB_DRIVER_PCICORE
77 pcidev = bus->pcicore.dev;
79 gpiodev = bus->chipco.dev ? : pcidev;
80 @@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
81 struct ssb_bus *bus = dev->dev->bus;
82 struct ssb_device *gpiodev, *pcidev = NULL;
84 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
85 +#ifdef CONFIG_SSB_DRIVER_PCICORE
86 pcidev = bus->pcicore.dev;
88 gpiodev = bus->chipco.dev ? : pcidev;
89 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
90 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
91 @@ -42,6 +42,6 @@ brcmsmac-y := \
92 brcms_trace_events.o \
95 -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
96 +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
98 obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
99 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
100 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
101 @@ -22,7 +22,7 @@ struct brcms_led {
105 -#ifdef CPTCFG_BCMA_DRIVER_GPIO
106 +#ifdef CONFIG_BCMA_DRIVER_GPIO
107 void brcms_led_unregister(struct brcms_info *wl);
108 int brcms_led_register(struct brcms_info *wl);
110 --- a/Kconfig.sources
111 +++ b/Kconfig.sources
112 @@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele
113 #source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
114 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
116 -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
117 -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
119 source "$BACKPORT_DIR/net/nfc/Kconfig"
121 #source "$BACKPORT_DIR/drivers/media/Kconfig"
122 --- a/Makefile.kernel
123 +++ b/Makefile.kernel
124 @@ -42,8 +42,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
125 obj-$(CPTCFG_WLAN) += drivers/net/wireless/
126 #obj-$(CPTCFG_BT) += net/bluetooth/
127 #obj-$(CPTCFG_BT) += drivers/bluetooth/
128 -obj-$(CPTCFG_SSB) += drivers/ssb/
129 -obj-$(CPTCFG_BCMA) += drivers/bcma/
130 #obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
131 obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
132 obj-$(CPTCFG_NFC) += net/nfc/