diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-10 22:21:36 -0800 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-10 22:21:36 -0800 |
| commit | c15a04338b5a6d4305d107a5b6c0cd43418b7f3e (patch) | |
| tree | 04d40a3b4fbc0477aa71c11044a20ff2d6666004 /arch/arm/mach-w90x900/dev.c | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
| parent | 60571f98d292b74586ff8330d8bc965eb01e8df0 (diff) | |
Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock
Diffstat (limited to 'arch/arm/mach-w90x900/dev.c')
| -rw-r--r-- | arch/arm/mach-w90x900/dev.c | 1 |
1 files changed, 1 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, |