Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 09a81e5e0d5d004efdfa4871e325d85191bbfa79..e59ac621b7e8e9795de5c03be05c4784e8be83ac 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1726,7 +1726,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
        if (match) {
                pdata = of_get_hsmmc_pdata(&pdev->dev);
                if (match->data) {
-                       u16 *offsetp = match->data;
+                       const u16 *offsetp = match->data;
                        pdata->reg_offset = *offsetp;
                }
        }