summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2009-09-22 14:29:36 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-09-22 20:49:04 +0100
commit6ef297f86b62f187c59475784208f75c2ed8ccd8 (patch)
tree333ea36bfdf0b7382fd810b33e24f58b63fd0707 /arch/arm/mach-u300
parent4321532cec25e1747961d83fb4f78ec24ea92966 (diff)
downloadop-kernel-dev-6ef297f86b62f187c59475784208f75c2ed8ccd8.zip
op-kernel-dev-6ef297f86b62f187c59475784208f75c2ed8ccd8.tar.gz
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-u300')
-rw-r--r--arch/arm/mach-u300/mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c
index 82af247..7b6b016 100644
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@ -19,8 +19,8 @@
#include <linux/regulator/consumer.h>
#include <linux/regulator/machine.h>
#include <linux/gpio.h>
+#include <linux/amba/mmci.h>
-#include <asm/mach/mmc.h>
#include "mmc.h"
#include "padmux.h"
@@ -28,7 +28,7 @@ struct mmci_card_event {
struct input_dev *mmc_input;
int mmc_inserted;
struct work_struct workq;
- struct mmc_platform_data mmc0_plat_data;
+ struct mmci_platform_data mmc0_plat_data;
};
static unsigned int mmc_status(struct device *dev)
OpenPOWER on IntegriCloud