diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
| commit | 17a505edb09495510ac8998450980472c412455b (patch) | |
| tree | 07f3a9e512f67cffae1dde071c8247821dd17e60 /drivers/mmc/host/omap_hsmmc.c | |
| parent | d9a807461fc8cc0d6ba589ea0730d139122af012 (diff) | |
| parent | b10dcdcac43b2b5adf800a19f782fef38ada75a1 (diff) | |
| download | linux-3.10-17a505edb09495510ac8998450980472c412455b.tar.gz linux-3.10-17a505edb09495510ac8998450980472c412455b.tar.bz2 linux-3.10-17a505edb09495510ac8998450980472c412455b.zip | |
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 686e256764c..8e2d81f1ee4 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1782,7 +1782,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; } } |