]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Fix timer compile
authorTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2007 12:09:10 +0000 (04:09 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2007 12:09:10 +0000 (04:09 -0800)
Fix timer compile

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/time.c
arch/arm/plat-omap/common.c
arch/arm/plat-omap/timer32k.c

index 64fefff5d99f61ac5348526df6e304f926d1ae08..9baec67104570ce56d5fe0968be17e75cd9e5f6c 100644 (file)
@@ -173,7 +173,7 @@ static struct clocksource clocksource_mpu = {
        .read           = mpu_read,
        .mask           = CLOCKSOURCE_MASK(32),
        .shift          = 24,
-       .is_continuous  = 1,
+       .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static void __init omap_init_clocksource(unsigned long rate)
index 2a72b9a4401937902ef14121c4fc1d92a666138f..1e106d18b184c37f85cd2b2dbd2e2de87008eee2 100644 (file)
@@ -212,7 +212,7 @@ static struct clocksource clocksource_32k = {
        .read           = omap_32k_read,
        .mask           = CLOCKSOURCE_MASK(32),
        .shift          = 10,
-       .is_continuous  = 1,
+       .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init omap_init_clocksource_32k(void)
index 884a280f8a1b39cf947dd6e88d7413617589c0c7..f28e12883e927eec01f98d7644e94772e01067c0 100644 (file)
@@ -272,22 +272,6 @@ static int omap_32k_timer_disable_dyn_tick(void)
        return 0;
 }
 
-static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id)
-{
-       unsigned long now;
-
-       now = omap_32k_sync_timer_read();
-
-       /* Don't bother reprogramming timer if last tick was before next
-        * jiffie. We will get another interrupt when previously programmed
-        * timer expires. This cuts down interrupt load quite a bit.
-        */
-       if (now - omap_32k_last_tick < OMAP_32K_TICKS_PER_HZ)
-               return IRQ_HANDLED;
-
-       return _omap_32k_timer_interrupt(irq, dev_id);
-}
-
 static struct dyn_tick_timer omap_dyn_tick_timer = {
        .enable         = omap_32k_timer_enable_dyn_tick,
        .disable        = omap_32k_timer_disable_dyn_tick,