130 lines
3.5 KiB
Diff
130 lines
3.5 KiB
Diff
--- a/.local-symbols
|
|
+++ b/.local-symbols
|
|
@@ -379,42 +379,6 @@ USB_CDC_PHONET=
|
|
USB_IPHETH=
|
|
USB_SIERRA_NET=
|
|
USB_VL600=
|
|
-SSB_POSSIBLE=
|
|
-SSB=
|
|
-SSB_SPROM=
|
|
-SSB_BLOCKIO=
|
|
-SSB_PCIHOST_POSSIBLE=
|
|
-SSB_PCIHOST=
|
|
-SSB_B43_PCI_BRIDGE=
|
|
-SSB_PCMCIAHOST_POSSIBLE=
|
|
-SSB_PCMCIAHOST=
|
|
-SSB_SDIOHOST_POSSIBLE=
|
|
-SSB_SDIOHOST=
|
|
-SSB_SILENT=
|
|
-SSB_DEBUG=
|
|
-SSB_SERIAL=
|
|
-SSB_DRIVER_PCICORE_POSSIBLE=
|
|
-SSB_DRIVER_PCICORE=
|
|
-SSB_PCICORE_HOSTMODE=
|
|
-SSB_DRIVER_MIPS=
|
|
-SSB_SFLASH=
|
|
-SSB_EMBEDDED=
|
|
-SSB_DRIVER_EXTIF=
|
|
-SSB_DRIVER_GIGE=
|
|
-SSB_DRIVER_GPIO=
|
|
-BCMA_POSSIBLE=
|
|
-BCMA=
|
|
-BCMA_BLOCKIO=
|
|
-BCMA_HOST_PCI_POSSIBLE=
|
|
-BCMA_HOST_PCI=
|
|
-BCMA_DRIVER_PCI_HOSTMODE=
|
|
-BCMA_HOST_SOC=
|
|
-BCMA_DRIVER_MIPS=
|
|
-BCMA_SFLASH=
|
|
-BCMA_NFLASH=
|
|
-BCMA_DRIVER_GMAC_CMN=
|
|
-BCMA_DRIVER_GPIO=
|
|
-BCMA_DEBUG=
|
|
NFC=
|
|
NFC_DIGITAL=
|
|
NFC_NCI=
|
|
--- a/Kconfig
|
|
+++ b/Kconfig
|
|
@@ -33,9 +33,6 @@ source drivers/net/wireless/Kconfig
|
|
source drivers/net/ethernet/Kconfig
|
|
source drivers/net/usb/Kconfig
|
|
|
|
-source drivers/ssb/Kconfig
|
|
-source drivers/bcma/Kconfig
|
|
-
|
|
source net/nfc/Kconfig
|
|
|
|
source drivers/regulator/Kconfig
|
|
--- a/Makefile.kernel
|
|
+++ b/Makefile.kernel
|
|
@@ -25,8 +25,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
|
|
obj-$(CPTCFG_WLAN) += drivers/net/wireless/
|
|
obj-$(CPTCFG_BT) += net/bluetooth/
|
|
obj-$(CPTCFG_BT) += drivers/bluetooth/
|
|
-obj-$(CPTCFG_SSB) += drivers/ssb/
|
|
-obj-$(CPTCFG_BCMA) += drivers/bcma/
|
|
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
|
|
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
|
|
obj-$(CPTCFG_NFC) += net/nfc/
|
|
--- a/drivers/net/wireless/b43/main.c
|
|
+++ b/drivers/net/wireless/b43/main.c
|
|
@@ -2734,7 +2734,7 @@ static struct ssb_device *b43_ssb_gpio_d
|
|
{
|
|
struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
|
-#ifdef CPTCFG_SSB_DRIVER_PCICORE
|
|
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
|
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
|
|
#else
|
|
return bus->chipco.dev;
|
|
@@ -4751,7 +4751,7 @@ static int b43_wireless_core_init(struct
|
|
}
|
|
if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
|
|
hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
|
|
-#ifdef CPTCFG_SSB_DRIVER_PCICORE
|
|
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
|
if (dev->dev->bus_type == B43_BUS_SSB &&
|
|
dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
|
|
dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
|
|
--- a/drivers/net/wireless/b43legacy/main.c
|
|
+++ b/drivers/net/wireless/b43legacy/main.c
|
|
@@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
|
|
if (dev->dev->id.revision >= 2)
|
|
mask |= 0x0010; /* FIXME: This is redundant. */
|
|
|
|
-#ifdef CPTCFG_SSB_DRIVER_PCICORE
|
|
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
|
pcidev = bus->pcicore.dev;
|
|
#endif
|
|
gpiodev = bus->chipco.dev ? : pcidev;
|
|
@@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
|
|
struct ssb_bus *bus = dev->dev->bus;
|
|
struct ssb_device *gpiodev, *pcidev = NULL;
|
|
|
|
-#ifdef CPTCFG_SSB_DRIVER_PCICORE
|
|
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
|
pcidev = bus->pcicore.dev;
|
|
#endif
|
|
gpiodev = bus->chipco.dev ? : pcidev;
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
|
|
@@ -43,6 +43,6 @@ brcmsmac-y := \
|
|
brcms_trace_events.o \
|
|
debug.o
|
|
|
|
-brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
|
|
+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
|
|
|
|
obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/led.h
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/led.h
|
|
@@ -22,7 +22,7 @@ struct brcms_led {
|
|
bool active_low;
|
|
};
|
|
|
|
-#ifdef CPTCFG_BCMA_DRIVER_GPIO
|
|
+#ifdef CONFIG_BCMA_DRIVER_GPIO
|
|
void brcms_led_unregister(struct brcms_info *wl);
|
|
int brcms_led_register(struct brcms_info *wl);
|
|
#else
|