From 893503d5138f4243258df54604a423132c5e83da Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <jgutierrez@ti.com>
Date: Sun, 13 May 2012 15:33:07 +0300
Subject: [PATCH] --- yaml --- r: 313007 b: refs/heads/master c:
 778d02e9b3b7188ce37ff542e54ff5df723659e6 h: refs/heads/master i:   313005:
 faa45dac91746655f77e0318097dbfed02ab66eb   313003:
 4a08aed66de2ba49861812b45353cc691f6de4e5   312999:
 3de1ddd87e3bcbf323c8f4689ce9a6ee4febc3b9   312991:
 5d579fcbb3146bee3f18fcd3182743d2d55272da v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap2/omap-iommu.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 37f618f014cd..30a4ab1751ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d8a0e963ac532e038d93ab0d30bbfad072f3bf8
+refs/heads/master: 778d02e9b3b7188ce37ff542e54ff5df723659e6
diff --git a/trunk/arch/arm/mach-omap2/omap-iommu.c b/trunk/arch/arm/mach-omap2/omap-iommu.c
index ac49384d0285..1be8bcb52e93 100644
--- a/trunk/arch/arm/mach-omap2/omap-iommu.c
+++ b/trunk/arch/arm/mach-omap2/omap-iommu.c
@@ -73,19 +73,17 @@ static struct iommu_device omap4_devices[] = {
 			.da_end = 0xFFFFF000,
 		},
 	},
-#if defined(CONFIG_MPU_TESLA_IOMMU)
 	{
 		.base = OMAP4_MMU2_BASE,
-		.irq = INT_44XX_DSP_MMU,
+		.irq = OMAP44XX_IRQ_TESLA_MMU,
 		.pdata = {
 			.name = "tesla",
 			.nr_tlb_entries = 32,
-			.clk_name = "tesla_ick",
+			.clk_name = "dsp_fck",
 			.da_start = 0x0,
 			.da_end = 0xFFFFF000,
 		},
 	},
-#endif
 };
 #define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
 static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];