diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rtl8187se/r8180_93cx6.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_93cx6.h')
-rw-r--r-- | drivers/staging/rtl8187se/r8180_93cx6.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/rtl8187se/r8180_93cx6.h b/drivers/staging/rtl8187se/r8180_93cx6.h index a028a51..36ae100 100644 --- a/drivers/staging/rtl8187se/r8180_93cx6.h +++ b/drivers/staging/rtl8187se/r8180_93cx6.h @@ -28,11 +28,9 @@ #define RFCHIPID_MAXIM 4 #define RFCHIPID_GCT 5 #define RFCHIPID_RTL8225 9 -#ifdef CONFIG_RTL8185B #define RF_ZEBRA2 11 #define EPROM_TXPW_BASE 0x05 #define RF_ZEBRA4 12 -#endif #define RFCHIPID_RTL8255 0xa #define RF_PARAM 0x19 #define RF_PARAM_DIGPHY_SHIFT 0 |