diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-03 12:21:16 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-20 18:55:17 -0500 |
| commit | a5ad6fbaddf8ada0c52935845a117c483ca0c6d6 (patch) | |
| tree | 91b7196a1c2b840c0b3dea7d32b62bfa0676255f /arch/arm | |
| parent | e5ddf4e352443ba010fd084c9e9271f9d0d10ae5 (diff) | |
| download | linux-a5ad6fbaddf8ada0c52935845a117c483ca0c6d6.tar.bz2 | |
ARM: mach-w90x900: properly disable CPU idle call
Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-w90x900/dev.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-w90x900/include/mach/system.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c index 78110befb7a9..db82568a998a 100644 --- a/arch/arm/mach-w90x900/dev.c +++ b/arch/arm/mach-w90x900/dev.c @@ -530,6 +530,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = { void __init nuc900_board_init(struct platform_device **device, int size) { + disable_hlt(); platform_add_devices(device, size); platform_add_devices(nuc900_public_dev, ARRAY_SIZE(nuc900_public_dev)); spi_register_board_info(nuc900_spi_board_info, diff --git a/arch/arm/mach-w90x900/include/mach/system.h b/arch/arm/mach-w90x900/include/mach/system.h index 2aaeb9311619..f713161ee50c 100644 --- a/arch/arm/mach-w90x900/include/mach/system.h +++ b/arch/arm/mach-w90x900/include/mach/system.h @@ -16,4 +16,5 @@ */ static void arch_idle(void) { + cpu_do_idle(); } |