Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API
Linus Torvalds
2 parents e032d80774 1a51a0ce17
Showing 1 changed file Side-by-side Diff
arch/arm/mach-omap2/devices.c
@@ -28,7 +28,6 @@
 #include <plat/board.h>
 #include <plat/mcbsp.h>
 #include <plat/mmc.h>
-#include <plat/iommu.h>
 #include <plat/dma.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
@@ -128,6 +127,10 @@
 };
 #endif
  
+#if defined(CONFIG_IOMMU_API)
+
+#include <plat/iommu.h>
+
 static struct resource omap3isp_resources[] = {
 	{
 		.start		= OMAP3430_ISP_BASE,
@@ -223,6 +226,15 @@
  
 	return platform_device_register(&omap3isp_device);
 }
+
+#else /* !CONFIG_IOMMU_API */
+
+int omap3_init_camera(struct isp_platform_data *pdata)
+{
+	return 0;
+}
+
+#endif
  
 static inline void omap_init_camera(void)
 {
...	...	@@ -28,7 +28,6 @@
28	28	#include <plat/board.h>
29	29	#include <plat/mcbsp.h>
30	30	#include <plat/mmc.h>
31		-#include <plat/iommu.h>
32	31	#include <plat/dma.h>
33	32	#include <plat/omap_hwmod.h>
34	33	#include <plat/omap_device.h>
...	...	@@ -128,6 +127,10 @@
128	127	};
129	128	#endif
130	129
	130	+#if defined(CONFIG_IOMMU_API)
	131	+
	132	+#include <plat/iommu.h>
	133	+
131	134	static struct resource omap3isp_resources[] = {
132	135	{
133	136	.start = OMAP3430_ISP_BASE,
...	...	@@ -223,6 +226,15 @@
223	226
224	227	return platform_device_register(&omap3isp_device);
225	228	}
	229	+
	230	+#else /* !CONFIG_IOMMU_API */
	231	+
	232	+int omap3_init_camera(struct isp_platform_data *pdata)
	233	+{
	234	+ return 0;
	235	+}
	236	+
	237	+#endif
226	238
227	239	static inline void omap_init_camera(void)
228	240	{