diff options
| -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 = { | |||
| 530 | 530 | ||
| 531 | void __init nuc900_board_init(struct platform_device **device, int size) | 531 | void __init nuc900_board_init(struct platform_device **device, int size) |
| 532 | { | 532 | { |
| 533 | disable_hlt(); | ||
| 533 | platform_add_devices(device, size); | 534 | platform_add_devices(device, size); |
| 534 | platform_add_devices(nuc900_public_dev, ARRAY_SIZE(nuc900_public_dev)); | 535 | platform_add_devices(nuc900_public_dev, ARRAY_SIZE(nuc900_public_dev)); |
| 535 | spi_register_board_info(nuc900_spi_board_info, | 536 | 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 @@ | |||
| 16 | */ | 16 | */ |
| 17 | static void arch_idle(void) | 17 | static void arch_idle(void) |
| 18 | { | 18 | { |
| 19 | cpu_do_idle(); | ||
| 19 | } | 20 | } |
