summaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-11 21:21:44 +0400
committerOlof Johansson <olof@lixom.net>2013-02-11 21:21:44 +0400
commit5f48a29f1721736930b7817b430039c1d348dd05 (patch)
tree69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-kirkwood/common.c
parent3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff)
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
downloadlinux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
-rw-r--r--arch/arm/mach-kirkwood/common.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index bac21a554c91..b5ad4dff6b12 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -530,7 +530,7 @@ static int __init kirkwood_find_tclk(void)
return 166666667;
}
-static void __init kirkwood_timer_init(void)
+void __init kirkwood_timer_init(void)
{
kirkwood_tclk = kirkwood_find_tclk();
@@ -538,10 +538,6 @@ static void __init kirkwood_timer_init(void)
IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
}
-struct sys_timer kirkwood_timer = {
- .init = kirkwood_timer_init,
-};
-
/*****************************************************************************
* Audio
****************************************************************************/