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

[linux-2.6] / arch / powerpc / platforms / 44x / ebony.c

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 481a016e153506eea25d60e336e254f5a87ffa2b..a0e8fe4662f61246ab02f8d7c668453d5ca2a676 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -18,6 +18,7 @@
 
 #include <linux/init.h>
 #include <linux/of_platform.h>
+#include <linux/rtc.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -25,8 +26,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
-
-#include "44x.h"
+#include <asm/ppc4xx.h>
 
 static __initdata struct of_device_id ebony_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -38,6 +38,7 @@ static __initdata struct of_device_id ebony_of_bus[] = {
 static int __init ebony_device_probe(void)
 {
        of_platform_bus_probe(NULL, ebony_of_bus, NULL);
+       of_instantiate_rtc();
 
        return 0;
 }
@@ -64,6 +65,6 @@ define_machine(ebony) {
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
-       .restart                = ppc44x_reset_system,
+       .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
 };