diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /arch/ia64/kernel/setup.c | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 2693e1522d7..5c7c95737bb 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -40,6 +40,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> @@ -783,6 +785,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 |