shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-31 08:16:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: purge epivers.h

Browse Source 
Purge include/epivers.h moving individual lines to where
they are needed and delete unused refs.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Brett Rudley
2010-10-27 15:47:53 -07:00
committed by Greg Kroah-Hartman
parent eb8160364f
commit 4766ae6ce7
3 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/brcm80211/include/epivers.h
View File

@@ -1,44 +0,0 @@
/*
* Copyright (c) 2010 Broadcom Corporation
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _epivers_h_
#define _epivers_h_
#define EPI_MAJOR_VERSION 5
#define EPI_MINOR_VERSION 75
#define EPI_RC_NUMBER 11
#define EPI_INCREMENTAL_NUMBER 0
#define EPI_BUILD_NUMBER 1
#define EPI_VERSION { 5, 75, 11, 0 }
#ifdef BCMSDIO
/* EPI_VERSION_NUM must match FW version */
#define EPI_VERSION_NUM 0x054b0c00
#else
#define EPI_VERSION_NUM 0x054b0b00
#endif
#define EPI_VERSION_DEV 5.75.11
/* Driver Version String, ASCII, 32 chars max */
#define EPI_VERSION_STR "5.75.11"
#endif /* _epivers_h_ */

11
drivers/staging/brcm80211/sys/wl_mac80211.c
View File

@@ -29,7 +29,6 @@
#include <wlc_cfg.h>
#include <net/mac80211.h>
#include <epivers.h>
#ifndef WLC_HIGH_ONLY
#include <phy_version.h>
#endif
@@ -894,8 +893,8 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
wl_release_fw(wl);
#endif
if (!wl->wlc) {
printf("%s: %s wlc_attach() failed with code %d\n",
KBUILD_MODNAME, EPI_VERSION_STR, err);
printf("%s: wlc_attach() failed with code %d\n",
KBUILD_MODNAME, err);
goto fail;
}
wl->pub = wlc_pub(wl->wlc);
@@ -962,10 +961,10 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
}
#ifndef WLC_HIGH_ONLY
WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver "
EPI_VERSION_STR " (" PHY_VERSION_STR ")", unit));
" (" PHY_VERSION_STR ")", unit));
#else
WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver "
EPI_VERSION_STR, unit));
WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 Splitmac MAC80211 Driver "
, unit));
#endif
#ifdef BCMDBG

3
drivers/staging/brcm80211/sys/wlc_mac80211.c
View File

@@ -27,7 +27,6 @@
#include <pcicfg.h>
#include <bcmsrom.h>
#include <wlioctl.h>
#include <epivers.h>
#include <sbhndpio.h>
#include <sbhnddma.h>
#include <hnddma.h>
@@ -136,6 +135,8 @@ uint wl_msg_level =
#define SCAN_IN_PROGRESS(x) 0
#define EPI_VERSION_NUM 0x054b0b00
#ifdef BCMDBG
/* pointer to most recently allocated wl/wlc */
static wlc_info_t *wlc_info_dbg = (wlc_info_t *) (NULL);