1 --- a/drivers/net/wireless/b43/main.c
2 +++ b/drivers/net/wireless/b43/main.c
3 @@ -4645,7 +4645,7 @@ static int b43_wireless_core_init(struct
4 switch (dev->dev->bus_type) {
7 - bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci,
8 + bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
12 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
13 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
14 @@ -697,7 +697,7 @@ void ai_pci_up(struct si_pub *sih)
15 sii = container_of(sih, struct si_info, pub);
17 if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
18 - bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
19 + bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
22 /* Unconfigure and/or apply various WARs when going down */
23 @@ -708,7 +708,7 @@ void ai_pci_down(struct si_pub *sih)
24 sii = container_of(sih, struct si_info, pub);
26 if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
27 - bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
28 + bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
31 /* Enable BT-COEX & Ex-PA for 4313 */
32 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
33 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
34 @@ -5079,7 +5079,7 @@ static int brcms_b_up_prep(struct brcms_
35 * Configure pci/pcmcia here instead of in brcms_c_attach()
36 * to allow mfg hotswap: down, hotswap (chip power cycle), up.
38 - bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci, wlc_hw->d11core,
39 + bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,