3 @@ -382,42 +382,6 @@ USB_CDC_PHONET=
11 -SSB_PCIHOST_POSSIBLE=
14 -SSB_PCMCIAHOST_POSSIBLE=
16 -SSB_SDIOHOST_POSSIBLE=
21 -SSB_DRIVER_PCICORE_POSSIBLE=
23 -SSB_PCICORE_HOSTMODE=
33 -BCMA_HOST_PCI_POSSIBLE=
35 -BCMA_DRIVER_PCI_HOSTMODE=
40 -BCMA_DRIVER_GMAC_CMN=
48 @@ -33,9 +33,6 @@ source drivers/net/wireless/Kconfig
49 source drivers/net/ethernet/Kconfig
50 source drivers/net/usb/Kconfig
52 -source drivers/ssb/Kconfig
53 -source drivers/bcma/Kconfig
55 source drivers/gpu/drm/Kconfig
57 source net/nfc/Kconfig
60 @@ -26,8 +26,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_DRM) += drivers/gpu/drm/
69 --- a/drivers/net/wireless/b43/main.c
70 +++ b/drivers/net/wireless/b43/main.c
71 @@ -2729,7 +2729,7 @@ static struct ssb_device *b43_ssb_gpio_d
73 struct ssb_bus *bus = dev->dev->sdev->bus;
75 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
76 +#ifdef CONFIG_SSB_DRIVER_PCICORE
77 return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
79 return bus->chipco.dev;
80 @@ -4736,7 +4736,7 @@ static int b43_wireless_core_init(struct
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. */
95 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
96 +#ifdef CONFIG_SSB_DRIVER_PCICORE
97 pcidev = bus->pcicore.dev;
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;
104 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
105 +#ifdef CONFIG_SSB_DRIVER_PCICORE
106 pcidev = bus->pcicore.dev;
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 \
115 -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
116 +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
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 {
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);