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/rtl8192su/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/rtl8192su/r8180_93cx6.h')
-rw-r--r-- | drivers/staging/rtl8192su/r8180_93cx6.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192su/r8180_93cx6.h b/drivers/staging/rtl8192su/r8180_93cx6.h index ca228d3..0309800 100644 --- a/drivers/staging/rtl8192su/r8180_93cx6.h +++ b/drivers/staging/rtl8192su/r8180_93cx6.h @@ -13,13 +13,8 @@ /*This files contains card eeprom (93c46 or 93c56) programming routines*/ /*memory is addressed by WORDS*/ -#ifdef RTL8192SU #include "r8192U.h" #include "r8192S_hw.h" -#else -#include "r8192U.h" -#include "r8192U_hw.h" -#endif #define EPROM_DELAY 10 |