diff --git a/[refs] b/[refs] index d8721169555d..8a3e8a01227c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823a937e36ab4318d6783374d121b75fb6c54b61 +refs/heads/master: c5d3cc0288cfecab34ed37623c37c72a679a167c diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h index 1e18ad0521db..7ca917203a95 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -808,5 +808,6 @@ extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, #define BRCMF_IDLE_IMMEDIATE (-1) #define BRCMF_IDLE_ACTIVE 0 /* Do not request any SD clock change when idle */ +#define BRCMF_IDLE_INTERVAL 1 #endif /* _BRCMF_H_ */ diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 4033e734d350..57049eceb142 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -747,9 +747,6 @@ module_param(brcmf_txbound, uint, 0); module_param(brcmf_rxbound, uint, 0); static uint brcmf_txminmax; -int brcmf_idletime = 1; -module_param(brcmf_idletime, int, 0); - #define SDIO_DRIVE_STRENGTH 6 /* in milliamps */ /* Use polling */ @@ -4650,7 +4647,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus) /* ...and initialize clock/power states */ bus->clkstate = CLK_SDONLY; - bus->idletime = (s32) brcmf_idletime; + bus->idletime = BRCMF_IDLE_INTERVAL; bus->idleclock = BRCMF_IDLE_ACTIVE; /* Query the F2 block size, set roundup accordingly */