From 281cc41ac7a26ff525ca65b010ac15d422368134 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 16 Jan 2012 08:06:09 -0600 Subject: [PATCH] --- yaml --- r: 295827 b: refs/heads/master c: f3b7cd2a9e3de578a462bb507279870dd41e032e h: refs/heads/master i: 295825: e66165a83142a50c44be0e6089eeb9e12f0965e9 295823: 2594c432bb9d158b7cc36c18ba8225c1d2703b44 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-highbank/highbank.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 98a0f92dc44d..9e86d4b88411 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7bf61620831c5578e434429bc7fa0fd0219c40c +refs/heads/master: f3b7cd2a9e3de578a462bb507279870dd41e032e diff --git a/trunk/arch/arm/mach-highbank/highbank.c b/trunk/arch/arm/mach-highbank/highbank.c index 8394d512a402..a96183e73fad 100644 --- a/trunk/arch/arm/mach-highbank/highbank.c +++ b/trunk/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"); }