aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/lacie_v2-common.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-15 13:54:00 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-15 13:54:00 +0900
commit344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch)
tree7b654a74727c57344296768c3a2d7d03b17f37ea /arch/arm/mach-kirkwood/lacie_v2-common.c
parentMerge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent (diff)
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 (diff)
downloadlinux-dev-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.tar.xz
linux-dev-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
Diffstat (limited to 'arch/arm/mach-kirkwood/lacie_v2-common.c')
-rw-r--r--arch/arm/mach-kirkwood/lacie_v2-common.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
index d3ea1b6c8a02..285edab776e9 100644
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c
@@ -111,17 +111,3 @@ void __init lacie_v2_hdd_power_init(int hdd_num)
pr_err("Failed to power up HDD%d\n", i + 1);
}
}
-
-/*****************************************************************************
- * Timer
- ****************************************************************************/
-
-static void lacie_v2_timer_init(void)
-{
- kirkwood_tclk = 166666667;
- orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
-}
-
-struct sys_timer lacie_v2_timer = {
- .init = lacie_v2_timer_init,
-};