staging: brcm80211: macro cleanup

[mv-sheeva.git] / drivers / staging / brcm80211 / include / chipcommon.h

diff --git a/drivers/staging/brcm80211/include/chipcommon.h b/drivers/staging/brcm80211/include/chipcommon.h
index 9ca2e691caadc09c16f5262f3f4f6a3a2ccc3ed3..ee1130fcb20acc0fb0979d60f034db05797df71c 100644 (file)
--- a/drivers/staging/brcm80211/include/chipcommon.h
+++ b/drivers/staging/brcm80211/include/chipcommon.h
@@ -17,12 +17,7 @@
 #ifndef        _SBCHIPC_H
 #define        _SBCHIPC_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                         /* PAD */
+#include "bcmdefs.h"           /* for PAD macro */
 
 typedef volatile struct {
        u32 chipid;             /* 0x0 */