[PATCH] staging: brcm80211: #define EPI_VERSION_STR outside of #ifdef DHD_DEBUG

Grant Grundler grundler at chromium.org
Thu Feb 10 02:19:28 UTC 2011


Greg,
Apologies for the malformed email...will resubmit.

thanks,
grant

On Wed, Feb 9, 2011 at 6:06 PM, Grant Grundler <grundler at chromium.org> wrote:
> henryp at broadcom.com, dowan at broadcom.com, rvossen at broadcom.com,
> arend at broadcom.com
> 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 at chromium.org>
>
> ---
> 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__;
>



More information about the devel mailing list