Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / sh / kernel / time.c

diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 960d9ab..9b352a1 100644 (file)
--- 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);
 }