From c6e32c749e39247d87ffc3e1bb73af5d4cc28e6f Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Thu, 23 Apr 2009 21:11:08 -0600
Subject: [PATCH] --- yaml --- r: 144496 b: refs/heads/master c:
 9198a40620fc69d577e854fb571e76af3313bc53 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/plat-omap/dmtimer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7432d1e3837..7a39d56753e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d53eb73795c55101453ea6ca4f486ea2ff7b0496
+refs/heads/master: 9198a40620fc69d577e854fb571e76af3313bc53
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
index bfd47570cc91..c99d611242a9 100644
--- a/trunk/arch/arm/plat-omap/dmtimer.c
+++ b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -238,7 +238,7 @@ static struct omap_dm_timer omap3_dm_timers[] = {
 	{ .phys_base = 0x49040000, .irq = INT_24XX_GPTIMER9 },
 	{ .phys_base = 0x48086000, .irq = INT_24XX_GPTIMER10 },
 	{ .phys_base = 0x48088000, .irq = INT_24XX_GPTIMER11 },
-	{ .phys_base = 0x48304000, .irq = INT_24XX_GPTIMER12 },
+	{ .phys_base = 0x48304000, .irq = INT_34XX_GPT12_IRQ },
 };
 
 static const char *omap3_dm_source_names[] __initdata = {