From 4563e365cd578299eeb138d9b7c9949829b35407 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 3 Aug 2011 12:21:16 -0400 Subject: [PATCH] --- yaml --- r: 295333 b: refs/heads/master c: a5ad6fbaddf8ada0c52935845a117c483ca0c6d6 h: refs/heads/master i: 295331: 07a271e8ff43efce5a84924b62a07da4d1f279e4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-w90x900/dev.c | 1 + trunk/arch/arm/mach-w90x900/include/mach/system.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bb5cb6940284..65c99929699e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ddf4e352443ba010fd084c9e9271f9d0d10ae5 +refs/heads/master: a5ad6fbaddf8ada0c52935845a117c483ca0c6d6 diff --git a/trunk/arch/arm/mach-w90x900/dev.c b/trunk/arch/arm/mach-w90x900/dev.c index 78110befb7a9..db82568a998a 100644 --- a/trunk/arch/arm/mach-w90x900/dev.c +++ b/trunk/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/trunk/arch/arm/mach-w90x900/include/mach/system.h b/trunk/arch/arm/mach-w90x900/include/mach/system.h index 2aaeb9311619..f713161ee50c 100644 --- a/trunk/arch/arm/mach-w90x900/include/mach/system.h +++ b/trunk/arch/arm/mach-w90x900/include/mach/system.h @@ -16,4 +16,5 @@ */ static void arch_idle(void) { + cpu_do_idle(); }