aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-06-13 13:37:52 -0700
committerColin Cross <ccross@android.com>2011-06-14 09:10:09 -0700
commit888da92e6c3d28f60e336923955e6849a34528c4 (patch)
tree23d573be77996f41ae105f25ef93745142086e10 /drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
parentd44b8ffa4b774998c6e96e04d7f30d144af7edc3 (diff)
downloadkernel_samsung_crespo-888da92e6c3d28f60e336923955e6849a34528c4.zip
kernel_samsung_crespo-888da92e6c3d28f60e336923955e6849a34528c4.tar.gz
kernel_samsung_crespo-888da92e6c3d28f60e336923955e6849a34528c4.tar.bz2
net: wireless: bcmdhd: Get rid of ANDROID define
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c')
-rw-r--r--drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
index baee3e6..8c328b8 100644
--- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
@@ -677,10 +677,10 @@ sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable)
else
data = SDIO_SEPINT_ACT_HI; /* disable hw oob interrupt */
-#if defined(ANDROID) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
/* Needed for Android Linux Kernel 2.6.35 */
data |= SDIO_SEPINT_ACT_HI; /* Active HIGH */
-#endif /* ANDROID */
+#endif
status = sdioh_request_byte(sd, SDIOH_WRITE, 0, SDIOD_CCCR_BRCM_SEPINT, &data);
return status;