diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-09-22 09:29:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:49:04 -0400 |
commit | 6ef297f86b62f187c59475784208f75c2ed8ccd8 (patch) | |
tree | 333ea36bfdf0b7382fd810b33e24f58b63fd0707 /arch/arm/mach-versatile/core.c | |
parent | 4321532cec25e1747961d83fb4f78ec24ea92966 (diff) |
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 'arch/arm/mach-versatile/core.c')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 975eae41ee6..e13be7c444c 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/amba/bus.h> | 27 | #include <linux/amba/bus.h> |
28 | #include <linux/amba/clcd.h> | 28 | #include <linux/amba/clcd.h> |
29 | #include <linux/amba/pl061.h> | 29 | #include <linux/amba/pl061.h> |
30 | #include <linux/amba/mmci.h> | ||
30 | #include <linux/clocksource.h> | 31 | #include <linux/clocksource.h> |
31 | #include <linux/clockchips.h> | 32 | #include <linux/clockchips.h> |
32 | #include <linux/cnt32_to_63.h> | 33 | #include <linux/cnt32_to_63.h> |
@@ -47,7 +48,6 @@ | |||
47 | #include <asm/mach/irq.h> | 48 | #include <asm/mach/irq.h> |
48 | #include <asm/mach/time.h> | 49 | #include <asm/mach/time.h> |
49 | #include <asm/mach/map.h> | 50 | #include <asm/mach/map.h> |
50 | #include <asm/mach/mmc.h> | ||
51 | 51 | ||
52 | #include "core.h" | 52 | #include "core.h" |
53 | #include "clock.h" | 53 | #include "clock.h" |
@@ -369,7 +369,7 @@ unsigned int mmc_status(struct device *dev) | |||
369 | return readl(VERSATILE_SYSMCI) & mask; | 369 | return readl(VERSATILE_SYSMCI) & mask; |
370 | } | 370 | } |
371 | 371 | ||
372 | static struct mmc_platform_data mmc0_plat_data = { | 372 | static struct mmci_platform_data mmc0_plat_data = { |
373 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, | 373 | .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, |
374 | .status = mmc_status, | 374 | .status = mmc_status, |
375 | .gpio_wp = -1, | 375 | .gpio_wp = -1, |