summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices/Makefile
diff options
context:
space:
mode:
authorGaëtan Carlier <gcembed@gmail.com>2012-09-05 13:06:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 16:21:48 +0100
commit3ab3a350200c14350220fffde893f3afb640fd25 (patch)
tree8c8e537f4159ebafe97dc5977b7efd90015eb6f2 /arch/arm/mach-imx/devices/Makefile
parentMerge remote-tracking branch 'arm-soc/imx/multiplatform' into x (diff)
downloadlinux-3ab3a350200c14350220fffde893f3afb640fd25.tar.xz
linux-3ab3a350200c14350220fffde893f3afb640fd25.zip
ARM : i.MX27 : split code for allocation of ressources of camera and eMMA
This is to prepare addition of m2m-emmapp driver otherwise IMX_HAVE_PLATFORM_MX2_CAMERA must be declared even if only Post-Processor is needed. IMX_HAVE_PLATFORM_MX2_EMMA define has been added. Changes since v1: - Add "select IMX_HAVE_PLATFORM_MX2_EMMA" for MACH_IMX27_VISSTRIM_M10 platform due to pending patch in linux-media tree that will call imx27_add_mx2_emmaprp(). Signed-off-by: Gaëtan Carlier <gcembed@gmail.com> Acked-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/devices/Makefile')
-rw-r--r--arch/arm/mach-imx/devices/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/devices/Makefile b/arch/arm/mach-imx/devices/Makefile
index 2abe2a5144d0..6acf37e0c119 100644
--- a/arch/arm/mach-imx/devices/Makefile
+++ b/arch/arm/mach-imx/devices/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX) += platform-sdhci-esdhc-imx.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) += platform-spi_imx.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_AHCI) += platform-ahci-imx.o
+obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_EMMA) += platform-mx2-emma.o