Auto merge with /home/aegl/GIT/linus

[linux-3.10.git] / arch / ia64 / kernel / setup.c

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 7fc891aca4460859ece27cc234bba099ad372443..84f89da7c6408b079666d47fd91beea38575a25b 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -41,6 +41,8 @@
 #include <linux/serial_core.h>
 #include <linux/efi.h>
 #include <linux/initrd.h>
 #include <linux/serial_core.h>
 #include <linux/efi.h>
 #include <linux/initrd.h>

+#include <linux/platform.h>
+#include <linux/pm.h>

 
 #include <asm/ia32.h>
 #include <asm/machvec.h>
 
 #include <asm/ia32.h>
 #include <asm/machvec.h>


@@ -816,6 +818,7 @@ cpu_init (void)
        /* size of physical stacked register partition plus 8 bytes: */
        __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8;
        platform_cpu_init();
        /* size of physical stacked register partition plus 8 bytes: */
        __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8;
        platform_cpu_init();

+       pm_idle = default_idle;

 }
 
 void
 }
 
 void