|
|
@@ -66,3 +66,64 @@
|
|
|
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
|
|
|
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
|
|
|
obj-$(CPTCFG_DRM) += drivers/gpu/drm/
|
|
|
+--- a/drivers/net/wireless/b43/main.c
|
|
|
++++ b/drivers/net/wireless/b43/main.c
|
|
|
+@@ -2727,7 +2727,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;
|
|
|
+@@ -4733,7 +4733,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
|