Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / bcmsdh.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index b1a6632..46346cb 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -912,7 +912,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                goto out;
        }
        switch (sdiodev->func2->device) {
-       case SDIO_DEVICE_ID_CYPRESS_4373:
+       case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:
                f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
                break;
        case SDIO_DEVICE_ID_BROADCOM_4359:
@@ -986,9 +986,9 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
        BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
        BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
        BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),
-       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373),
-       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_43012),
-       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_89359),
+       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),
+       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),
+       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),
        { /* end: all zeroes */ }
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);