summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/isa-timer.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-28 08:03:23 +0100
committerOlof Johansson <olof@lixom.net>2013-01-28 08:03:34 +0100
commit66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch)
treea30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-footbridge/isa-timer.c
parentMerge branch 'vt8500/wm8x50' into next/soc (diff)
parentMerge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff)
downloadlinux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.xz
linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-footbridge/isa-timer.c')
-rw-r--r--arch/arm/mach-footbridge/isa-timer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index c40bb415f4b5..d9301dd56354 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -31,14 +31,10 @@ static struct irqaction pit_timer_irq = {
.dev_id = &i8253_clockevent,
};
-static void __init isa_timer_init(void)
+void __init isa_timer_init(void)
{
clocksource_i8253_init();
setup_irq(i8253_clockevent.irq, &pit_timer_irq);
clockevent_i8253_init(false);
}
-
-struct sys_timer isa_timer = {
- .init = isa_timer_init,
-};