diff options
| author | Arend van Spriel <[email protected]> | 2011-06-29 16:47:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-07-05 09:57:21 -0700 |
| commit | c8796cbeabba6dd946b78edea71dbee90edabbf0 (patch) | |
| tree | 2838fa6b41906a7d2b6cc951a2490e1d34a76a22 | |
| parent | 67a646f0d381f8ec3080f379651661e030b29312 (diff) | |
staging: brcm80211: rename EPI_VERSION_STR macro
The fullmac version macro has been renamed and moved to dhd.h to
get rid of having it defined in two separate c source files.
Signed-off-by: Arend van Spriel <[email protected]>
Reviewed-by: Roland Vossen <[email protected]>
Reviewed-by: Franky Lin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd.h | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 5 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 87c65f13ec68..7e19d807603c 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -21,6 +21,8 @@ #ifndef _dhd_h_ #define _dhd_h_ +#define BRCMF_VERSION_STR "4.218.248.5" + #define BRCMF_C_IOCTL_SMLEN 256 /* "small" ioctl buffer required */ #define BRCMF_C_IOCTL_MEDLEN 1536 /* "med" ioctl buffer required */ #define BRCMF_C_IOCTL_MAXLEN 8192 diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 22739f03744e..5207fa9a6b84 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -36,15 +36,14 @@ int brcmf_msg_level; char brcmf_fw_path[MOD_PARAM_PATHLEN]; char brcmf_nv_path[MOD_PARAM_PATHLEN]; -#define EPI_VERSION_STR "4.218.248.5" #define MSGTRACE_VERSION 1 #ifdef BCMDBG const char brcmf_version[] = -"Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on " __DATE__ +"Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on " __DATE__ " at " __TIME__; #else -const char brcmf_version[] = "Dongle Host Driver, version " EPI_VERSION_STR; +const char brcmf_version[] = "Dongle Host Driver, version " BRCMF_VERSION_STR; #endif /* IOVar table */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 53279419b016..19e09bd82643 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -43,7 +43,6 @@ #include "dhd_dbg.h" #include "wl_cfg80211.h" -#define EPI_VERSION_STR "4.218.248.5" #define ETH_P_BRCM 0x886c /* Global ASSERT type flag */ @@ -1278,7 +1277,7 @@ static int brcmf_ethtool(dhd_info_t *dhd, void *uaddr) /* if dhd requested, identify ourselves */ if (strcmp(drvname, "?dhd") == 0) { sprintf(info.driver, "dhd"); - strcpy(info.version, EPI_VERSION_STR); + strcpy(info.version, BRCMF_VERSION_STR); } /* otherwise, require dongle to be up */ |