mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-07-07 22:34:11 +03:00
32f81d1ba7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33937 3c298f89-4303-0410-b956-a3cf2f4a3e73
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
--- a/drivers/net/wireless/b43/main.c
|
|
+++ b/drivers/net/wireless/b43/main.c
|
|
@@ -4645,7 +4645,7 @@ static int b43_wireless_core_init(struct
|
|
switch (dev->dev->bus_type) {
|
|
#ifdef CONFIG_B43_BCMA
|
|
case B43_BUS_BCMA:
|
|
- bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci,
|
|
+ bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
|
|
dev->dev->bdev, true);
|
|
break;
|
|
#endif
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
|
@@ -697,7 +697,7 @@ void ai_pci_up(struct si_pub *sih)
|
|
sii = container_of(sih, struct si_info, pub);
|
|
|
|
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
|
- bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
|
|
+ bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
|
|
}
|
|
|
|
/* Unconfigure and/or apply various WARs when going down */
|
|
@@ -708,7 +708,7 @@ void ai_pci_down(struct si_pub *sih)
|
|
sii = container_of(sih, struct si_info, pub);
|
|
|
|
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
|
- bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
|
|
+ bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
|
|
}
|
|
|
|
/* Enable BT-COEX & Ex-PA for 4313 */
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
@@ -5079,7 +5079,7 @@ static int brcms_b_up_prep(struct brcms_
|
|
* Configure pci/pcmcia here instead of in brcms_c_attach()
|
|
* to allow mfg hotswap: down, hotswap (chip power cycle), up.
|
|
*/
|
|
- bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci, wlc_hw->d11core,
|
|
+ bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,
|
|
true);
|
|
|
|
/*
|