Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 3 deletions

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index c45e18449f32..8819b97be324 100644
--- 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;