From 0807a0866476d62ccb68c55739a523fe12b53900 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Wed, 7 Apr 2010 09:57:23 +0000
Subject: [PATCH] --- yaml --- r: 190279 b: refs/heads/master c:
 46cdc4e431536c279b1ce00520d6fe6e9ca42b04 h: refs/heads/master i:   190277:
 f9efe50de24d354d2e2f493edaf9ed4e15307298   190275:
 cad0168d5437f3ec15efc81034d85fcc5f9d5145   190271:
 c3a2aa72685f9fb3933bd2919ab34851c2d9b2e1 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/mach-omap1/timer32k.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 7f256e562c4c..92c4a2df9e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2decb12e3ebec556520dd92178572449af8ed617
+refs/heads/master: 46cdc4e431536c279b1ce00520d6fe6e9ca42b04
diff --git a/trunk/arch/arm/mach-omap1/timer32k.c b/trunk/arch/arm/mach-omap1/timer32k.c
index 9ad118563f7d..20cfbcc6c60c 100644
--- a/trunk/arch/arm/mach-omap1/timer32k.c
+++ b/trunk/arch/arm/mach-omap1/timer32k.c
@@ -68,12 +68,6 @@ struct sys_timer omap_timer;
  * ---------------------------------------------------------------------------
  */
 
-#if defined(CONFIG_ARCH_OMAP16XX)
-#define TIMER_32K_SYNCHRONIZED		0xfffbc410
-#else
-#error OMAP 32KHz timer does not currently work on 15XX!
-#endif
-
 /* 16xx specific defines */
 #define OMAP1_32K_TIMER_BASE		0xfffb9000
 #define OMAP1_32K_TIMER_CR		0x08
@@ -150,15 +144,6 @@ static struct clock_event_device clockevent_32k_timer = {
 	.set_mode	= omap_32k_timer_set_mode,
 };
 
-/*
- * The 32KHz synchronized timer is an additional timer on 16xx.
- * It is always running.
- */
-static inline unsigned long omap_32k_sync_timer_read(void)
-{
-	return omap_readl(TIMER_32K_SYNCHRONIZED);
-}
-
 static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
 {
 	struct clock_event_device *evt = &clockevent_32k_timer;