diff --git a/[refs] b/[refs]
index 858b387a3e1e..814df7b3518b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb
+refs/heads/master: 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468
diff --git a/trunk/arch/arm/mach-omap2/omap-iommu.c b/trunk/arch/arm/mach-omap2/omap-iommu.c
index 6be548cdd800..3fc5dc7233da 100644
--- a/trunk/arch/arm/mach-omap2/omap-iommu.c
+++ b/trunk/arch/arm/mach-omap2/omap-iommu.c
@@ -37,7 +37,7 @@ static struct iommu_device omap3_devices[] = {
 			.da_end = 0xFFFFF000,
 		},
 	},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
+#if defined(CONFIG_OMAP_IOMMU_IVA2)
 	{
 		.base = 0x5d000000,
 		.irq = 28,
diff --git a/trunk/arch/arm/plat-omap/Kconfig b/trunk/arch/arm/plat-omap/Kconfig
index 92c5bb7909f5..5e63e5069e0d 100644
--- a/trunk/arch/arm/plat-omap/Kconfig
+++ b/trunk/arch/arm/plat-omap/Kconfig
@@ -109,6 +109,9 @@ config OMAP_IOMMU_DEBUG
 
          Say N unless you know you need this.
 
+config OMAP_IOMMU_IVA2
+	bool
+
 choice
 	prompt "System timer"
 	default OMAP_32K_TIMER if !ARCH_OMAP15XX