diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index b0740c82d70b..55da7a115912 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <mach/sh7372.h> | 57 | #include <mach/sh7372.h> |
58 | 58 | ||
59 | #include <asm/mach/arch.h> | 59 | #include <asm/mach/arch.h> |
60 | #include <asm/mach/time.h> | ||
61 | #include <asm/mach-types.h> | 60 | #include <asm/mach-types.h> |
62 | 61 | ||
63 | /* | 62 | /* |
@@ -1554,21 +1553,11 @@ static void __init mackerel_init(void) | |||
1554 | pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); | 1553 | pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); |
1555 | } | 1554 | } |
1556 | 1555 | ||
1557 | static void __init mackerel_timer_init(void) | ||
1558 | { | ||
1559 | sh7372_clock_init(); | ||
1560 | shmobile_timer.init(); | ||
1561 | } | ||
1562 | |||
1563 | static struct sys_timer mackerel_timer = { | ||
1564 | .init = mackerel_timer_init, | ||
1565 | }; | ||
1566 | |||
1567 | MACHINE_START(MACKEREL, "mackerel") | 1556 | MACHINE_START(MACKEREL, "mackerel") |
1568 | .map_io = sh7372_map_io, | 1557 | .map_io = sh7372_map_io, |
1569 | .init_early = sh7372_add_early_devices, | 1558 | .init_early = sh7372_add_early_devices, |
1570 | .init_irq = sh7372_init_irq, | 1559 | .init_irq = sh7372_init_irq, |
1571 | .handle_irq = shmobile_handle_irq_intc, | 1560 | .handle_irq = shmobile_handle_irq_intc, |
1572 | .init_machine = mackerel_init, | 1561 | .init_machine = mackerel_init, |
1573 | .timer = &mackerel_timer, | 1562 | .timer = &shmobile_timer, |
1574 | MACHINE_END | 1563 | MACHINE_END |