diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
commit | a6065b3dd8fa22efcedaf65517f4ec47ba25661d (patch) | |
tree | f3aead47130b9fbe9fae7c88048f4963daba6463 /drivers/mmc | |
parent | 1eb42c73ca0a3692fb928e9f125cf84544ad5f12 (diff) | |
parent | d8d3f25e6a3b7abb37d569b0e36adc069b190a3a (diff) |
Merge commit 'd8d3f25' (misc branch) into linaro-2.6.38
Conflicts:
arch/arm/kernel/head.S
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/mmci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2d6de3e03e2..67f17d61b97 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -713,7 +713,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; |