Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (6e03db2b) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap2/devices.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -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 @@ static struct platform_device omap2cam_device = {
		};
		#endif

		#if defined(CONFIG_IOMMU_API)

		#include <plat/iommu.h>

		static struct resource omap3isp_resources[] = {
		{
		.start = OMAP3430_ISP_BASE,
		@@ -224,6 +227,15 @@ int omap3_init_camera(struct isp_platform_data *pdata)
		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)
		{
		#if defined(CONFIG_VIDEO_OMAP2) \|\| defined(CONFIG_VIDEO_OMAP2_MODULE)