diff options
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-highbank/include/mach/memory.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index bb1684f9b68b..808b055289b2 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -110,7 +110,7 @@ static void __init highbank_timer_init(void) | |||
110 | 110 | ||
111 | highbank_clocks_init(); | 111 | highbank_clocks_init(); |
112 | 112 | ||
113 | sp804_clocksource_init(timer_base + 0x20, "timer1"); | 113 | sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); |
114 | sp804_clockevents_init(timer_base, irq, "timer0"); | 114 | sp804_clockevents_init(timer_base, irq, "timer0"); |
115 | 115 | ||
116 | twd_local_timer_of_register(); | 116 | twd_local_timer_of_register(); |
diff --git a/arch/arm/mach-highbank/include/mach/memory.h b/arch/arm/mach-highbank/include/mach/memory.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-highbank/include/mach/memory.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | /* empty */ | ||