diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-10 01:24:09 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-10 01:24:09 +0300 |
| commit | cf7700fe24301df2c8d3636cf40784651c098207 (patch) | |
| tree | 2897be493f1b9af0c3a992c541a22f403c6e405c /arch/x86/Makefile | |
| parent | 9b706aee7d92d6ac3002547aea12e3eaa0a750ae (diff) | |
| download | linux-cf7700fe24301df2c8d3636cf40784651c098207.tar.xz | |
x86 PM: move 64-bit hibernation files to arch/x86/power
Move arch/x86/kernel/suspend_64.c to arch/x86/power .
Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power
as hibernate_asm_64.S .
Update purpose and copyright information in
arch/x86/power/suspend_64.c and
arch/x86/power/hibernate_asm_64.S .
Update the Makefiles in arch/x86, arch/x86/kernel and
arch/x86/power to reflect the above changes.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 364865b1b08d..204af43535c5 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -191,8 +191,10 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/ # must be linked after kernel/ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ -ifeq ($(CONFIG_X86_32),y) +# suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/ + +ifeq ($(CONFIG_X86_32),y) drivers-$(CONFIG_FB) += arch/x86/video/ endif |