Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

[sfrench/cifs-2.6.git] / arch / m68k / mac / config.c

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index c45e18449f321b820f08dc12409dfadc0083cf60..8819b97be32401b096587de6dcdda41e504a1749 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -162,10 +162,7 @@ void __init config_mac(void)
        mach_init_IRQ = mac_init_IRQ;
        mach_get_model = mac_get_model;
        mach_gettimeoffset = mac_gettimeoffset;
-#warning move to adb/via init
-#if 0
        mach_hwclk = mac_hwclk;
-#endif
        mach_set_clock_mmss = mac_set_clock_mmss;
        mach_reset = mac_reset;
        mach_halt = mac_poweroff;