diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2009-09-22 14:29:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:49:04 +0100 |
| commit | 6ef297f86b62f187c59475784208f75c2ed8ccd8 (patch) | |
| tree | 333ea36bfdf0b7382fd810b33e24f58b63fd0707 /drivers/mmc/host/mmci.c | |
| parent | 4321532cec25e1747961d83fb4f78ec24ea92966 (diff) | |
| download | kernel_samsung_smdk4412-6ef297f86b62f187c59475784208f75c2ed8ccd8.zip kernel_samsung_smdk4412-6ef297f86b62f187c59475784208f75c2ed8ccd8.tar.gz kernel_samsung_smdk4412-6ef297f86b62f187c59475784208f75c2ed8ccd8.tar.bz2 | |
ARM: 5720/1: Move MMCI header to amba include dir
This moves the mmci platform data definition struct away from
arch/arm/include/asm/mach/mmc.h into the more proper place among
the other primecells in include/linux/amba/mmci.h and at the same
time renames it to "mmci.h", and also the struct in this file
confusingly named mmc_platform_data has been renamed
mmci_platform_data for clarity.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index bf7c05b..79205e5 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -22,12 +22,12 @@ #include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/gpio.h> +#include <linux/amba/mmci.h> #include <asm/cacheflush.h> #include <asm/div64.h> #include <asm/io.h> #include <asm/sizes.h> -#include <asm/mach/mmc.h> #include "mmci.h" @@ -537,7 +537,7 @@ static void mmci_check_status(unsigned long data) static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) { - struct mmc_platform_data *plat = dev->dev.platform_data; + struct mmci_platform_data *plat = dev->dev.platform_data; struct mmci_host *host; struct mmc_host *mmc; int ret; |