Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / brcm80211 / brcmfmac / bcmchip.h

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmchip.h b/drivers/staging/brcm80211/brcmfmac/bcmchip.h
index c0d4c3b..d7d3afd 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmchip.h
+++ b/drivers/staging/brcm80211/brcmfmac/bcmchip.h
@@ -17,12 +17,6 @@
 #ifndef _bcmchip_h_
 #define _bcmchip_h_
 
-/* Core reg address translation */
-#define CORE_CC_REG(base, field)       (base + offsetof(chipcregs_t, field))
-#define CORE_BUS_REG(base, field)      (base + offsetof(sdpcmd_regs_t, field))
-#define CORE_SB(base, field) \
-               (base + SBCONFIGOFF + offsetof(sbconfig_t, field))
-
 /* bcm4329 */
 /* SDIO device core, ID 0x829 */
 #define BCM4329_CORE_BUS_BASE          0x18011000
@@ -31,5 +25,8 @@
 /* ARM Cortex M3 core, ID 0x82a */
 #define BCM4329_CORE_ARM_BASE          0x18002000
 #define BCM4329_RAMSIZE                        0x48000
+/* firmware name */
+#define BCM4329_FW_NAME                        "brcm/bcm4329-fullmac-4.bin"
+#define BCM4329_NV_NAME                        "brcm/bcm4329-fullmac-4.txt"
 
 #endif                         /* _bcmchip_h_ */