From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 04:16:42 +0000 (+1100)
Subject: Merge remote-tracking branch 'iommu/next'
X-Git-Tag: next-20111004~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ddd54fff9e8d987fced17128a97470c4aec384e5;p=karo-tx-linux.git

Merge remote-tracking branch 'iommu/next'
---

ddd54fff9e8d987fced17128a97470c4aec384e5
diff --cc drivers/media/video/Kconfig
index aed5b3d740ca,620106937ec6..75e43c05aeea
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -775,10 -753,17 +775,9 @@@ config VIDEO_VIA_CAMER
  	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
  	   with ov7670 sensors.
  
 -config VIDEO_NOON010PC30
 -	tristate "NOON010PC30 CIF camera sensor support"
 -	depends on I2C && VIDEO_V4L2
 -	---help---
 -	  This driver supports NOON010PC30 CIF camera from Siliconfile
 -
 -source "drivers/media/video/m5mols/Kconfig"
 -
  config VIDEO_OMAP3
  	tristate "OMAP 3 Camera support (EXPERIMENTAL)"
- 	select OMAP_IOMMU
- 	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
+ 	depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
  	---help---
  	  Driver for an OMAP 3 camera controller.