diff --git a/[refs] b/[refs] index b38be2dd20cd..07fa0c60962e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ca59c6f70b77b07085e8b9785b24f76aa87634c +refs/heads/master: ab8c7bf5456d4334e6f78566d0d09fb547903dac diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 7090a3670a6d..53de5a7bda05 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -759,9 +759,7 @@ static uint brcmf_txminmax; int brcmf_idletime = 1; module_param(brcmf_idletime, int, 0); -/* SDIO Drive Strength (in milliamps) */ -uint brcmf_sdiod_drive_strength = 6; -module_param(brcmf_sdiod_drive_strength, uint, 0); +#define SDIO_DRIVE_STRENGTH 6 /* in milliamps */ /* Use polling */ uint brcmf_poll; @@ -4607,7 +4605,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) goto fail; } - brcmf_sdbrcm_sdiod_drive_strength_init(bus, brcmf_sdiod_drive_strength); + brcmf_sdbrcm_sdiod_drive_strength_init(bus, SDIO_DRIVE_STRENGTH); /* Get info on the ARM and SOCRAM cores... */ brcmf_sdcard_reg_read(bus->sdiodev,