Auto merge with /home/aegl/GIT/linus

2005-07-13 12:15:43 -07:00
parent f62c4a96f7 9a556e8908
commit 99ad25a313
591 changed files with 39836 additions and 33120 deletions
--- 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/platform.h>
+#include <linux/pm.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();
+	pm_idle = default_idle;
 }

 void