From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from rcsinet13.oracle.com ([148.87.113.125]:38247 "EHLO rgminet13.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751584AbZCDQu3 (ORCPT ); Wed, 4 Mar 2009 11:50:29 -0500 Message-ID: <49AEB18E.5050901@oracle.com> (sfid-20090304_175033_167451_D0ED6789) Date: Wed, 04 Mar 2009 08:51:26 -0800 From: Randy Dunlap MIME-Version: 1.0 To: Michael Buesch CC: John W Linville , bcm43xx-dev@lists.berlios.de, linux-wireless@vger.kernel.org, Stephen Rothwell Subject: Re: [PATCH] b43: Fix compilation for devices without PCI core References: <200903041641.11302.mb@bu3sch.de> In-Reply-To: <200903041641.11302.mb@bu3sch.de> Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: Michael Buesch wrote: > This fixes compilation, if the PCI core is disabled. > > Signed-off-by: Michael Buesch > > --- Ack. Thanks. > > 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 > =================================================================== > --- wireless-testing.orig/drivers/net/wireless/b43/main.c 2009-03-04 16:35:07.000000000 +0100 > +++ wireless-testing/drivers/net/wireless/b43/main.c 2009-03-04 16:36:08.000000000 +0100 > @@ -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); > -- ~Randy