Changeset 36973


Ignore:
Timestamp:
2013-06-19T23:33:31+02:00 (5 years ago)
Author:
hauke
Message:

mac80211: do not use CPTCFG_SSB and CPTCFG_BCMA

ssb and bcma are not build by compat-wireless / backports and the
config symbols are also not taken from there. Use the in kernel config
symbols. This fixes a build error in brcmsmac/led.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/060-no_local_ssb_bcma.patch

    r36939 r36973  
    6767 obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ 
    6868 obj-$(CPTCFG_DRM) += drivers/gpu/drm/ 
     69--- a/drivers/net/wireless/b43/main.c 
     70+++ b/drivers/net/wireless/b43/main.c 
     71@@ -2727,7 +2727,7 @@ static struct ssb_device *b43_ssb_gpio_d 
     72 { 
     73        struct ssb_bus *bus = dev->dev->sdev->bus; 
     74  
     75-#ifdef CPTCFG_SSB_DRIVER_PCICORE 
     76+#ifdef CONFIG_SSB_DRIVER_PCICORE 
     77        return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); 
     78 #else 
     79        return bus->chipco.dev; 
     80@@ -4733,7 +4733,7 @@ static int b43_wireless_core_init(struct 
     81        } 
     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. */ 
     94  
     95-#ifdef CPTCFG_SSB_DRIVER_PCICORE 
     96+#ifdef CONFIG_SSB_DRIVER_PCICORE 
     97        pcidev = bus->pcicore.dev; 
     98 #endif 
     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; 
     103  
     104-#ifdef CPTCFG_SSB_DRIVER_PCICORE 
     105+#ifdef CONFIG_SSB_DRIVER_PCICORE 
     106        pcidev = bus->pcicore.dev; 
     107 #endif 
     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 \ 
     113        debug.o 
     114  
     115-brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o 
     116+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o 
     117  
     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 { 
     122        bool active_low; 
     123 }; 
     124  
     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); 
     129 #else 
Note: See TracChangeset for help on using the changeset viewer.