From 888da92e6c3d28f60e336923955e6849a34528c4 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 13 Jun 2011 13:37:52 -0700 Subject: [PATCH 295/696] net: wireless: bcmdhd: Get rid of ANDROID define Signed-off-by: Dmitry Shmidt --- drivers/net/wireless/bcmdhd/Makefile | 5 +---- drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 4 ++-- drivers/net/wireless/bcmdhd/dhd_linux.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 5c296bc..b476372 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -6,7 +6,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Werror -Dlinux -DBCMDRIVER \ -DCUSTOMER_HW2 -DCUSTOM_OOB_GPIO_NUM=2 -DOOB_INTR_ONLY -DHW_OOB \ -DMMC_SDIO_ABORT -DBCMSDIO -DBCMLXSDMMC -DBCMPLATFORM_BUS -DWLP2P \ -DNEW_COMPAT_WIRELESS -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT \ - -DKEEP_ALIVE -DCSCAN \ + -DKEEP_ALIVE -DCSCAN -DGET_CUSTOM_MAC_ENABLE \ -Idrivers/net/wireless/bcmdhd -Idrivers/net/wireless/bcmdhd/include DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \ @@ -24,8 +24,5 @@ ifneq ($(CONFIG_CFG80211),) bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o wldev_common.o DHDCFLAGS += -DWL_CFG80211 endif -ifneq ($(CONFIG_ANDROID),) -DHDCFLAGS += -DANDROID -DGET_CUSTOM_MAC_ENABLE -endif EXTRA_CFLAGS = $(DHDCFLAGS) EXTRA_LDFLAGS += --strip-debug 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; diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 3685675..acdff3b 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -89,7 +89,7 @@ typedef struct histo_ { static histo_t vi_d1, vi_d2, vi_d3, vi_d4; #endif /* WLMEDIA_HTSF */ -#if defined(ANDROID) && defined(SOFTAP) +#if defined(SOFTAP) extern bool ap_cfg_running; #endif @@ -1123,7 +1123,7 @@ dhd_op_if(dhd_if_t *ifp) __FUNCTION__, err)); ret = -EOPNOTSUPP; } else { -#if defined(ANDROID) && defined(SOFTAP) +#if defined(SOFTAP) if (ap_cfg_running && !(dhd->dhd_state & DHD_ATTACH_STATE_CFG80211)) { /* semaphore that the soft AP CODE waits on */ flags = dhd_os_spin_lock(&dhd->pub); -- 1.7.1