Greg, Apologies for the malformed email...will resubmit. thanks, grant On Wed, Feb 9, 2011 at 6:06 PM, Grant Grundler <grundler@xxxxxxxxxxxx> wrote: > henryp@xxxxxxxxxxxx, dowan@xxxxxxxxxxxx, rvossen@xxxxxxxxxxxx, > arend@xxxxxxxxxxxx > Subject: [PATCH] staging: brcm80211: fix compile for !DHD_DEBUG case > > Move #define EPI_VERSION_STR outside of #ifdef DHD_DEBUG so the code > compiles when DHD_DEBUG is not defined. > > Signed-off-by: Grant Grundler <grundler@xxxxxxxxxxxx> > > --- > EPI_VERSION_STR is defined in both dhd_linux.c and dhd_common.c. ÂMy > first clue that those two files should probably be merged. Added to > my TODO list. > > diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c > index 5165251..eeabbc3 100644 > --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c > +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c > @@ -57,8 +57,8 @@ void dhd_iscan_unlock(void); > Â#error DHD_SDALIGN is not a power of 2! > Â#endif > > -#ifdef DHD_DEBUG > Â#define EPI_VERSION_STR Â Â Â Â "4.218.248.5" > +#ifdef DHD_DEBUG > Âconst char dhd_version[] = > Â"Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on " __DATE__ > Â" at " __TIME__; > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
