diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-tegra/common.c | |
parent | 709baa67c676a187a63c0f0f40efceb3fb1eef72 (diff) | |
parent | 61b80086a525c8a6081257ae40da5dee2bcaee16 (diff) |
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Conflicts:
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c
This resolves two conflicts and lets us merge the exynos5 branch
cleanly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
-rw-r--r-- | arch/arm/mach-tegra/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 09dc37fc4299..68815ce3f666 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <asm/hardware/gic.h> | 27 | #include <asm/hardware/gic.h> |
28 | 28 | ||
29 | #include <mach/iomap.h> | 29 | #include <mach/iomap.h> |
30 | #include <mach/system.h> | ||
31 | #include <mach/powergate.h> | 30 | #include <mach/powergate.h> |
32 | 31 | ||
33 | #include "board.h" | 32 | #include "board.h" |
@@ -115,6 +114,8 @@ static void __init tegra_init_cache(u32 tag_latency, u32 data_latency) | |||
115 | #ifdef CONFIG_ARCH_TEGRA_2x_SOC | 114 | #ifdef CONFIG_ARCH_TEGRA_2x_SOC |
116 | void __init tegra20_init_early(void) | 115 | void __init tegra20_init_early(void) |
117 | { | 116 | { |
117 | disable_hlt(); /* idle WFI usage needs to be confirmed */ | ||
118 | |||
118 | tegra_init_fuse(); | 119 | tegra_init_fuse(); |
119 | tegra2_init_clocks(); | 120 | tegra2_init_clocks(); |
120 | tegra_clk_init_from_table(tegra20_clk_init_table); | 121 | tegra_clk_init_from_table(tegra20_clk_init_table); |