summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/devices-mx23.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-30 00:54:54 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-30 00:54:54 +0400
commitb43d151e9679a06df896ac3db65a9dca80040fed (patch)
treeac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-mxs/devices-mx23.h
parentdfad549d98b60160547d1b8299051b9456c8da85 (diff)
parent5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (diff)
downloadlinux-b43d151e9679a06df896ac3db65a9dca80040fed.tar.xz
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-mxs/devices-mx23.h')
-rw-r--r--arch/arm/mach-mxs/devices-mx23.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/devices-mx23.h b/arch/arm/mach-mxs/devices-mx23.h
index c7e14f4e3669..c6f345febd39 100644
--- a/arch/arm/mach-mxs/devices-mx23.h
+++ b/arch/arm/mach-mxs/devices-mx23.h
@@ -21,6 +21,10 @@ extern const struct mxs_auart_data mx23_auart_data[] __initconst;
#define mx23_add_auart0() mx23_add_auart(0)
#define mx23_add_auart1() mx23_add_auart(1)
+extern const struct mxs_mxs_mmc_data mx23_mxs_mmc_data[] __initconst;
+#define mx23_add_mxs_mmc(id, pdata) \
+ mxs_add_mxs_mmc(&mx23_mxs_mmc_data[id], pdata)
+
#define mx23_add_mxs_pwm(id) mxs_add_mxs_pwm(MX23_PWM_BASE_ADDR, id)
struct platform_device *__init mx23_add_mxsfb(