diff options
author | Roland Vossen <rvossen@broadcom.com> | 2011-06-01 13:45:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 12:37:02 -0700 |
commit | 745c9e6ebc001b540ecbf5401d70797236caa1df (patch) | |
tree | 29906c6791ccc3eabb0828412e6de67e9abc1e52 /drivers/staging/brcm80211/include | |
parent | d5f27a8f894ed069a5e7336139a9a13391c6b13e (diff) | |
download | op-kernel-dev-745c9e6ebc001b540ecbf5401d70797236caa1df.zip op-kernel-dev-745c9e6ebc001b540ecbf5401d70797236caa1df.tar.gz |
staging: brcm80211: deleted sbconfig.h, renamed sbcc.h
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/include')
-rw-r--r-- | drivers/staging/brcm80211/include/bcmdefs.h | 12 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/bcmsoc.h | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/chipcommon.h (renamed from drivers/staging/brcm80211/include/sbchipc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/sbconfig.h | 32 |
4 files changed, 12 insertions, 33 deletions
diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h index cf9dc0e..304d8ed 100644 --- a/drivers/staging/brcm80211/include/bcmdefs.h +++ b/drivers/staging/brcm80211/include/bcmdefs.h @@ -95,4 +95,16 @@ typedef struct wl_rateset { #define PM_MAX 1 #define PM_FAST 2 +/* + * Sonics Configuration Space Registers. + */ +#define SBCONFIGOFF 0xf00 /* core sbconfig regs are top 256bytes of regs */ + +/* cpp contortions to concatenate w/arg prescan */ +#ifndef PAD +#define _PADLINE(line) pad ## line +#define _XSTR(line) _PADLINE(line) +#define PAD _XSTR(__LINE__) +#endif + #endif /* _bcmdefs_h_ */ diff --git a/drivers/staging/brcm80211/include/bcmsoc.h b/drivers/staging/brcm80211/include/bcmsoc.h index 6435686..012e465 100644 --- a/drivers/staging/brcm80211/include/bcmsoc.h +++ b/drivers/staging/brcm80211/include/bcmsoc.h @@ -18,7 +18,6 @@ #define _HNDSOC_H /* Include the soci specific files */ -#include <sbconfig.h> #include <aidmp.h> /* diff --git a/drivers/staging/brcm80211/include/sbchipc.h b/drivers/staging/brcm80211/include/chipcommon.h index 9ca2e69..9ca2e69 100644 --- a/drivers/staging/brcm80211/include/sbchipc.h +++ b/drivers/staging/brcm80211/include/chipcommon.h diff --git a/drivers/staging/brcm80211/include/sbconfig.h b/drivers/staging/brcm80211/include/sbconfig.h deleted file mode 100644 index 68e4b54..0000000 --- a/drivers/staging/brcm80211/include/sbconfig.h +++ /dev/null @@ -1,32 +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 _SBCONFIG_H -#define _SBCONFIG_H - -/* cpp contortions to concatenate w/arg prescan */ -#ifndef PAD -#define _PADLINE(line) pad ## line -#define _XSTR(line) _PADLINE(line) -#define PAD _XSTR(__LINE__) -#endif - -/* - * Sonics Configuration Space Registers. - */ -#define SBCONFIGOFF 0xf00 /* core sbconfig regs are top 256bytes of regs */ - -#endif /* _SBCONFIG_H */ |