diff options
Diffstat (limited to 'arch/arm/mach-bcmring/core.c')
-rw-r--r-- | arch/arm/mach-bcmring/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c index 492c649f451e..e590bbe0a7b4 100644 --- a/arch/arm/mach-bcmring/core.c +++ b/arch/arm/mach-bcmring/core.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/clocksource.h> | 31 | #include <linux/clocksource.h> |
32 | #include <linux/clockchips.h> | 32 | #include <linux/clockchips.h> |
33 | 33 | ||
34 | #include <linux/amba/bus.h> | ||
35 | #include <mach/csp/mm_addr.h> | 34 | #include <mach/csp/mm_addr.h> |
36 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
37 | #include <asm/clkdev.h> | 36 | #include <asm/clkdev.h> |
@@ -45,7 +44,6 @@ | |||
45 | #include <asm/mach/irq.h> | 44 | #include <asm/mach/irq.h> |
46 | #include <asm/mach/time.h> | 45 | #include <asm/mach/time.h> |
47 | #include <asm/mach/map.h> | 46 | #include <asm/mach/map.h> |
48 | #include <asm/mach/mmc.h> | ||
49 | 47 | ||
50 | #include <cfg_global.h> | 48 | #include <cfg_global.h> |
51 | 49 | ||
@@ -273,12 +271,12 @@ static struct irqaction bcmring_timer_irq = { | |||
273 | .handler = bcmring_timer_interrupt, | 271 | .handler = bcmring_timer_interrupt, |
274 | }; | 272 | }; |
275 | 273 | ||
276 | static cycle_t bcmring_get_cycles_timer1(void) | 274 | static cycle_t bcmring_get_cycles_timer1(struct clocksource *cs) |
277 | { | 275 | { |
278 | return ~readl(TIMER1_VA_BASE + TIMER_VALUE); | 276 | return ~readl(TIMER1_VA_BASE + TIMER_VALUE); |
279 | } | 277 | } |
280 | 278 | ||
281 | static cycle_t bcmring_get_cycles_timer3(void) | 279 | static cycle_t bcmring_get_cycles_timer3(struct clocksource *cs) |
282 | { | 280 | { |
283 | return ~readl(TIMER3_VA_BASE + TIMER_VALUE); | 281 | return ~readl(TIMER3_VA_BASE + TIMER_VALUE); |
284 | } | 282 | } |