From 553a50961c70118b10f484569cbe5488b1f66d13 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Tue, 13 Sep 2011 09:49:44 +0200 Subject: [PATCH] --- yaml --- r: 268411 b: refs/heads/master c: 7d16c0ffff8cf8fbe915aa7cafbeadcff70a81bf h: refs/heads/master i: 268409: d386b1103ea02b2070411a8268310348e9a70ef6 268407: c31992024606729904f30429493d3285ba3ffa9f v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18250a9cca93..38b9ebd5c856 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b87987b1f4524f9abca525c5d2a346ea0079d295 +refs/heads/master: 7d16c0ffff8cf8fbe915aa7cafbeadcff70a81bf diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 0aff62d89a61..7cb8f3f5a96c 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -49,12 +49,10 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { }; MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); -#ifdef CONFIG_PM_SLEEP static DECLARE_WAIT_QUEUE_HEAD(sdioh_request_byte_wait); static DECLARE_WAIT_QUEUE_HEAD(sdioh_request_word_wait); static DECLARE_WAIT_QUEUE_HEAD(sdioh_request_packet_wait); static DECLARE_WAIT_QUEUE_HEAD(sdioh_request_buffer_wait); -#endif /* CONFIG_PM_SLEEP */ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)