diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:05:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:05:52 +0100 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-tegra/common.c | |
| parent | Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/... (diff) | |
| parent | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ... (diff) | |
| download | linux-38abdcd0d0689aaca94e740ac67a952c7918caef.tar.xz linux-38abdcd0d0689aaca94e740ac67a952c7918caef.zip | |
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 @@ #include <asm/hardware/gic.h> #include <mach/iomap.h> -#include <mach/system.h> #include <mach/powergate.h> #include "board.h" @@ -115,6 +114,8 @@ static void __init tegra_init_cache(u32 tag_latency, u32 data_latency) #ifdef CONFIG_ARCH_TEGRA_2x_SOC void __init tegra20_init_early(void) { + disable_hlt(); /* idle WFI usage needs to be confirmed */ + tegra_init_fuse(); tegra2_init_clocks(); tegra_clk_init_from_table(tegra20_clk_init_table); |