From f3b7cd2a9e3de578a462bb507279870dd41e032e Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 16 Jan 2012 08:06:09 -0600 Subject: ARM: highbank: enable sp804 based sched_clock Initialize sched_clock to use the sp804 timer. Signed-off-by: Rob Herring --- arch/arm/mach-highbank/highbank.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-highbank') diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8394d512a40..a96183e73fa 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -109,7 +109,7 @@ static void __init highbank_timer_init(void) highbank_clocks_init(); - sp804_clocksource_init(timer_base + 0x20, "timer1"); + sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); sp804_clockevents_init(timer_base, irq, "timer0"); } -- cgit v1.2.3-18-g5258 From b024e33682c8e56cc8e869245dabd1b91ffe00ea Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 10 Feb 2012 09:43:00 -0600 Subject: ARM: highbank: remove unused memory.h memory.h is empty and no longer needed to build, so remove it. Signed-off-by: Rob Herring --- arch/arm/mach-highbank/include/mach/memory.h | 1 - 1 file changed, 1 deletion(-) delete mode 100644 arch/arm/mach-highbank/include/mach/memory.h (limited to 'arch/arm/mach-highbank') 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 40a8c178f10..00000000000 --- a/arch/arm/mach-highbank/include/mach/memory.h +++ /dev/null @@ -1 +0,0 @@ -/* empty */ -- cgit v1.2.3-18-g5258