From: Paul Mundt Date: Sun, 14 Jun 2009 11:02:30 +0000 (+0900) Subject: sh: Bump the earlytimer probe devices up. X-Git-Tag: v2.6.31-rc1~139^2~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6fe32a468521d45edc35d92cdc05cd74e930426a;p=karo-tx-linux.git sh: Bump the earlytimer probe devices up. Presently the earlytimer probe handles the clockevents driver, which requires that the clockevents driver be registered first. This bumps it up by 1 to include the clocksource device, which can be safely ignored if it doesn't exist, as we will simply error out on that path and defer to the jiffies clocksource. Signed-off-by: Paul Mundt --- diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 960d9abd1058..9b352a1e3fb4 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -108,8 +108,13 @@ void __init time_init(void) /* * Make sure all compiled-in early timers register themselves. - * Run probe() for one "earlytimer" device. + * + * Run probe() for two "earlytimer" devices, these will be the + * clockevents and clocksource devices respectively. In the event + * that only a clockevents device is available, we -ENODEV on the + * clocksource and the jiffies clocksource is used transparently + * instead. No error handling is necessary here. */ early_platform_driver_register_all("earlytimer"); - early_platform_driver_probe("earlytimer", 1, 0); + early_platform_driver_probe("earlytimer", 2, 0); }