Merge branches 'master' and 'devel' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

1 files changed, 0 insertions, 21 deletions

diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index cf75694e9687..66528193f939 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -200,24 +200,3 @@ void __init timer_init(int irq)
         clocksource_register(&cksrc);
         clockevents_register_device(&ckevt);
 }
-
-static void __init mmp2_timer_init(void)
-{
-        unsigned long clk_rst;
-
-        __raw_writel(APBC_APBCLK | APBC_RST, APBC_MMP2_TIMERS);
-
-        /*
-         * enable bus/functional clock, enable 6.5MHz (divider 4),
-         * release reset
-         */
-        clk_rst = APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1);
-        __raw_writel(clk_rst, APBC_MMP2_TIMERS);
-
-        timer_init(IRQ_MMP2_TIMER1);
-}
-
-struct sys_timer mmp2_timer = {
-        .init   = mmp2_timer_init,
-};
-