b43: Fix compilation for devices without PCI core
PATCH 1/1 b43: Fix compilation for devices without PCI core
This fixes compilation, if the PCI core is disabled.
Signed-off-by Michael Buesch <[email protected]>
---
John, I think this is only needed for the next feature release, as the patch that broke that was only merged for next, afaik.
drivers/net/wireless/b43/main.c +2 -0
@@ -4176,15 +4176,17 @@ static int b43_wireless_core_init(struct hf |=B43_HF_4318TSSI ;if (phy->radio_rev <6 ) hf |=B43_HF_VCORECALC ; }if (sprom->boardflags_lo &B43_BFL_XTAL_NOSLOW ) hf |=B43_HF_DSCRQ ;/* Disable slowclock requests from ucode. */ +#ifdef CONFIG_SSB_DRIVER_PCICORE if ((bus->bustype ==SSB_BUSTYPE_PCI ) && (bus->pcicore.dev->id.revision <=10 )) hf |=B43_HF_PCISCW ;/* PCI slow clock workaround. */ +#endif hf &= ~B43_HF_SKCFPUP ;b43_hf_write (dev, hf);b43_set_retry_limits (dev,B43_DEFAULT_SHORT_RETRY_LIMIT ,B43_DEFAULT_LONG_RETRY_LIMIT );b43_shm_write16 (dev,B43_SHM_SHARED ,B43_SHM_SH_SFFBLIM ,3 );
Signature · 1 line
Greetings, Michael.
Quoted 5 lines · Michael Buesch
This fixes compilation, if the PCI core is disabled.
Signed-off-by Michael Buesch <[email protected]>---
Ack. Thanks.
Quoted 27 lines
John, I think this is only needed for the next feature release, as the patch that broke that was only merged for next, afaik.
Index:
wireless-testing/drivers/net/wireless/b43/main.c
===================================================================drivers/net/wireless/b43/main.c +2
-0@@ -4176,15 +4176,17 @@ static int b43_wireless_core_init(struct hf |=B43_HF_4318TSSI ;if (phy->radio_rev <6 ) hf |=B43_HF_VCORECALC ; }if (sprom->boardflags_lo &B43_BFL_XTAL_NOSLOW ) hf |=B43_HF_DSCRQ ;/* Disable slowclock requests from ucode. */ +#ifdef CONFIG_SSB_DRIVER_PCICORE if ((bus->bustype ==SSB_BUSTYPE_PCI ) && (bus->pcicore.dev->id.revision <=10 )) hf |=B43_HF_PCISCW ;/* PCI slow clock workaround. */ +#endif hf &= ~B43_HF_SKCFPUP ;b43_hf_write (dev, hf);b43_set_retry_limits (dev,B43_DEFAULT_SHORT_RETRY_LIMIT ,B43_DEFAULT_LONG_RETRY_LIMIT );b43_shm_write16 (dev,B43_SHM_SHARED ,B43_SHM_SH_SFFBLIM ,3 );
Signature · 1 line
~Randy