3 @@ -417,43 +417,6 @@ USB_SIERRA_NET=
11 -SSB_PCIHOST_POSSIBLE=
14 -SSB_PCMCIAHOST_POSSIBLE=
16 -SSB_SDIOHOST_POSSIBLE=
20 -SSB_DRIVER_PCICORE_POSSIBLE=
22 -SSB_PCICORE_HOSTMODE=
32 -BCMA_HOST_PCI_POSSIBLE=
36 -BCMA_DRIVER_PCI_HOSTMODE=
41 -BCMA_DRIVER_GMAC_CMN=
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
52 depends on B43 && SSB_PCIHOST_POSSIBLE
54 - select SSB_B43_PCI_BRIDGE
55 + depends on SSB_PCIHOST
56 + depends on SSB_B43_PCI_BRIDGE
59 # Auto-select SSB PCICORE driver, if possible
60 config B43_PCICORE_AUTOSELECT
62 depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE
63 - select SSB_DRIVER_PCICORE
64 + depends on SSB_DRIVER_PCICORE
68 bool "Broadcom 43xx SDIO device support"
69 depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
71 + depends on SSB_SDIOHOST
73 Broadcom 43xx device support for Soft-MAC SDIO devices.
75 @@ -96,13 +96,13 @@ config B43_SDIO
78 depends on B43 && B43_BCMA
80 + depends on BCMA_BLOCKIO
85 depends on B43 && B43_SSB
87 + depends on SSB_BLOCKIO
91 --- a/drivers/net/wireless/broadcom/b43/main.c
92 +++ b/drivers/net/wireless/broadcom/b43/main.c
93 @@ -2851,7 +2851,7 @@ static struct ssb_device *b43_ssb_gpio_d
95 struct ssb_bus *bus = dev->dev->sdev->bus;
97 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
98 +#ifdef CONFIG_SSB_DRIVER_PCICORE
99 return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
101 return bus->chipco.dev;
102 @@ -4868,7 +4868,7 @@ static int b43_wireless_core_init(struct
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)"
116 depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
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
125 depends on B43LEGACY && SSB_PCIHOST_POSSIBLE
127 - select SSB_B43_PCI_BRIDGE
128 + depends on SSB_PCIHOST
129 + depends on SSB_B43_PCI_BRIDGE
132 # Auto-select SSB PCICORE driver, if possible
133 config B43LEGACY_PCICORE_AUTOSELECT
135 depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE
136 - select SSB_DRIVER_PCICORE
137 + depends on SSB_DRIVER_PCICORE
141 --- a/drivers/net/wireless/broadcom/b43legacy/main.c
142 +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
143 @@ -1906,7 +1906,7 @@ static int b43legacy_gpio_init(struct b4
144 if (dev->dev->id.revision >= 2)
145 mask |= 0x0010; /* FIXME: This is redundant. */
147 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
148 +#ifdef CONFIG_SSB_DRIVER_PCICORE
149 pcidev = bus->pcicore.dev;
151 gpiodev = bus->chipco.dev ? : pcidev;
152 @@ -1925,7 +1925,7 @@ static void b43legacy_gpio_cleanup(struc
153 struct ssb_bus *bus = dev->dev->bus;
154 struct ssb_device *gpiodev, *pcidev = NULL;
156 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
157 +#ifdef CONFIG_SSB_DRIVER_PCICORE
158 pcidev = bus->pcicore.dev;
160 gpiodev = bus->chipco.dev ? : pcidev;
161 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
162 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
163 @@ -22,7 +22,7 @@ struct brcms_led {
167 -#ifdef CPTCFG_BCMA_DRIVER_GPIO
168 +#ifdef CONFIG_BCMA_DRIVER_GPIO
169 void brcms_led_unregister(struct brcms_info *wl);
170 int brcms_led_register(struct brcms_info *wl);
172 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
173 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
174 @@ -42,6 +42,6 @@ brcmsmac-y := \
175 brcms_trace_events.o \
178 -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
179 +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
181 obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
182 --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
183 +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
184 @@ -8,7 +8,7 @@ config BRCMSMAC
187 depends on BCMA_POSSIBLE
190 select NEW_LEDS if BCMA_DRIVER_GPIO
191 select LEDS_CLASS if BCMA_DRIVER_GPIO
195 @@ -1255,117 +1255,6 @@ config BACKPORTED_USB_NET_CH9200
196 config BACKPORTED_USB_NET_AQC111
198 default USB_NET_AQC111
199 -config BACKPORTED_SSB_POSSIBLE
201 - default SSB_POSSIBLE
202 -config BACKPORTED_SSB
205 -config BACKPORTED_SSB_SPROM
208 -config BACKPORTED_SSB_BLOCKIO
210 - default SSB_BLOCKIO
211 -config BACKPORTED_SSB_PCIHOST_POSSIBLE
213 - default SSB_PCIHOST_POSSIBLE
214 -config BACKPORTED_SSB_PCIHOST
216 - default SSB_PCIHOST
217 -config BACKPORTED_SSB_B43_PCI_BRIDGE
219 - default SSB_B43_PCI_BRIDGE
220 -config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE
222 - default SSB_PCMCIAHOST_POSSIBLE
223 -config BACKPORTED_SSB_PCMCIAHOST
225 - default SSB_PCMCIAHOST
226 -config BACKPORTED_SSB_SDIOHOST_POSSIBLE
228 - default SSB_SDIOHOST_POSSIBLE
229 -config BACKPORTED_SSB_SDIOHOST
231 - default SSB_SDIOHOST
232 -config BACKPORTED_SSB_HOST_SOC
234 - default SSB_HOST_SOC
235 -config BACKPORTED_SSB_SERIAL
238 -config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE
240 - default SSB_DRIVER_PCICORE_POSSIBLE
241 -config BACKPORTED_SSB_DRIVER_PCICORE
243 - default SSB_DRIVER_PCICORE
244 -config BACKPORTED_SSB_PCICORE_HOSTMODE
246 - default SSB_PCICORE_HOSTMODE
247 -config BACKPORTED_SSB_DRIVER_MIPS
249 - default SSB_DRIVER_MIPS
250 -config BACKPORTED_SSB_SFLASH
253 -config BACKPORTED_SSB_EMBEDDED
255 - default SSB_EMBEDDED
256 -config BACKPORTED_SSB_DRIVER_EXTIF
258 - default SSB_DRIVER_EXTIF
259 -config BACKPORTED_SSB_DRIVER_GIGE
261 - default SSB_DRIVER_GIGE
262 -config BACKPORTED_SSB_DRIVER_GPIO
264 - default SSB_DRIVER_GPIO
265 -config BACKPORTED_BCMA_POSSIBLE
267 - default BCMA_POSSIBLE
268 -config BACKPORTED_BCMA
271 -config BACKPORTED_BCMA_BLOCKIO
273 - default BCMA_BLOCKIO
274 -config BACKPORTED_BCMA_HOST_PCI_POSSIBLE
276 - default BCMA_HOST_PCI_POSSIBLE
277 -config BACKPORTED_BCMA_HOST_PCI
279 - default BCMA_HOST_PCI
280 -config BACKPORTED_BCMA_HOST_SOC
282 - default BCMA_HOST_SOC
283 -config BACKPORTED_BCMA_DRIVER_PCI
285 - default BCMA_DRIVER_PCI
286 -config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE
288 - default BCMA_DRIVER_PCI_HOSTMODE
289 -config BACKPORTED_BCMA_DRIVER_MIPS
291 - default BCMA_DRIVER_MIPS
292 -config BACKPORTED_BCMA_PFLASH
294 - default BCMA_PFLASH
295 -config BACKPORTED_BCMA_SFLASH
297 - default BCMA_SFLASH
298 -config BACKPORTED_BCMA_NFLASH
300 - default BCMA_NFLASH
301 -config BACKPORTED_BCMA_DRIVER_GMAC_CMN
303 - default BCMA_DRIVER_GMAC_CMN
304 -config BACKPORTED_BCMA_DRIVER_GPIO
306 - default BCMA_DRIVER_GPIO
307 -config BACKPORTED_BCMA_DEBUG
310 config BACKPORTED_USB_ACM
313 --- a/Kconfig.sources
314 +++ b/Kconfig.sources
315 @@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconf
316 source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
317 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
319 -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
320 -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
322 source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
324 source "$BACKPORT_DIR/drivers/staging/Kconfig"
325 --- a/Makefile.kernel
326 +++ b/Makefile.kernel
327 @@ -40,8 +40,6 @@ obj-y += compat/
328 obj-$(CPTCFG_CFG80211) += net/wireless/
329 obj-$(CPTCFG_MAC80211) += net/mac80211/
330 obj-$(CPTCFG_WLAN) += drivers/net/wireless/
331 -obj-$(CPTCFG_SSB) += drivers/ssb/
332 -obj-$(CPTCFG_BCMA) += drivers/bcma/
333 obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
335 obj-$(CPTCFG_USB_WDM) += drivers/usb/class/