diff --git a/[refs] b/[refs] index c2094b799106..89c793f448c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019f45f27464e91cd1936a22600a05779bbe5573 +refs/heads/master: a3b0b566cd1d0759d26d8357366bb80f08aa069a diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 5423280ba746..6c2391b9907e 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -725,14 +725,6 @@ module_param(brcmf_dpc_prio, int, 0); #define SDIO_DRIVE_STRENGTH 6 /* in milliamps */ -/* Use polling */ -uint brcmf_poll; -module_param(brcmf_poll, uint, 0); - -/* Use interrupts */ -uint brcmf_intr = true; -module_param(brcmf_intr, uint, 0); - #define RETRYCHAN(chan) ((chan) == SDPCM_EVENT_CHANNEL) /* Retry count for register access failures */ @@ -4324,8 +4316,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) BRCMF_SDALIGN); /* Set the poll and/or interrupt flags */ - bus->intr = (bool) brcmf_intr; - bus->poll = (bool) brcmf_poll; + bus->intr = true; + bus->poll = false; if (bus->poll) bus->pollrate = 1;