Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / mmci.c

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 8a29c9f4a812f754fdb03189eae2c27f346af61b..5bbb87d102514b62c25a4c78b50be5c753e51c80 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -965,7 +965,8 @@ static const struct mmc_host_ops mmci_ops = {
        .get_cd         = mmci_get_cd,
 };
 
-static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
+static int __devinit mmci_probe(struct amba_device *dev,
+       const struct amba_id *id)
 {
        struct mmci_platform_data *plat = dev->dev.platform_data;
        struct variant_data *variant = id->data;