diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:47:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:47:27 -0800 |
| commit | 6e03db2ba17b5d32431b4c2012e6a41153318a90 (patch) | |
| tree | 001d90ae19ec62d7f34df127a36783ef78e5bc75 | |
| parent | e032d80774315869aa2285b217fdbbfed86c0b49 (diff) | |
| parent | 1a51a0ce174ddc0b0c11b6a0dbd179d95020e80b (diff) | |
| download | op-kernel-dev-6e03db2ba17b5d32431b4c2012e6a41153318a90.zip op-kernel-dev-6e03db2ba17b5d32431b4c2012e6a41153318a90.tar.gz | |
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
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 46dfd1a..0b510ad0 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/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 @@ 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) |
