diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-12-19 14:24:03 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:06:05 -0500 |
commit | 229f05fdb025ff82f47221c11ee5dfa73f7e4cb2 (patch) | |
tree | 5b6a03121c3801ee5cfb399b746aa03bac779639 | |
parent | ac8a494894e0e7add2fd0919d1929c21d8cf03e1 (diff) |
arm/tegra: Delete tegra_init_clock()
tegra_init_clock() is written to call tegra2_init_clocks(), which only
exists if Tegra20 support is enabled. This breaks the build of a
Tegra30-only kernel.
tegra_init_clock() isn't actually used any more; tegra20_init_early()
calls tegra2_init_clocks() directly. So, just delete this function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-tegra/board.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/clock.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 628f5a8a0d9a..75d1543d77c0 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h | |||
@@ -30,7 +30,6 @@ void __init tegra30_init_early(void); | |||
30 | void __init tegra_map_common_io(void); | 30 | void __init tegra_map_common_io(void); |
31 | void __init tegra_init_irq(void); | 31 | void __init tegra_init_irq(void); |
32 | void __init tegra_dt_init_irq(void); | 32 | void __init tegra_dt_init_irq(void); |
33 | void __init tegra_init_clock(void); | ||
34 | int __init tegra_pcie_init(bool init_port0, bool init_port1); | 33 | int __init tegra_pcie_init(bool init_port0, bool init_port1); |
35 | 34 | ||
36 | extern struct sys_timer tegra_timer; | 35 | extern struct sys_timer tegra_timer; |
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index a8f359d8ae17..8337068a4abe 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c | |||
@@ -399,11 +399,6 @@ void tegra_periph_reset_assert(struct clk *c) | |||
399 | } | 399 | } |
400 | EXPORT_SYMBOL(tegra_periph_reset_assert); | 400 | EXPORT_SYMBOL(tegra_periph_reset_assert); |
401 | 401 | ||
402 | void __init tegra_init_clock(void) | ||
403 | { | ||
404 | tegra2_init_clocks(); | ||
405 | } | ||
406 | |||
407 | #ifdef CONFIG_DEBUG_FS | 402 | #ifdef CONFIG_DEBUG_FS |
408 | 403 | ||
409 | static int __clk_lock_all_spinlocks(void) | 404 | static int __clk_lock_all_spinlocks(void) |