diff options
| author | Sergio Luis <sergio@larces.uece.br> | 2009-04-28 00:26:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-12 21:32:29 +0200 |
| commit | f6783d20d4b85b360b4a6f86bdbd9282a4a7004c (patch) | |
| tree | be697adb8ccf61fda9341d43bc85da93c8c34a36 /arch | |
| parent | PM: Warn if interrupts are enabled during suspend-resume of sysdevs (diff) | |
| download | linux-f6783d20d4b85b360b4a6f86bdbd9282a4a7004c.tar.xz linux-f6783d20d4b85b360b4a6f86bdbd9282a4a7004c.zip | |
x86: unify power/cpu_(32|64) headers
First step towards the unification of cpu_32.c and cpu_64.c.
This commit unifies the headers of such files, making both
of them use the same header files. It also remove the uneeded
<module.h>.
Signed-off-by: Sergio Luis <sergio@larces.uece.br>
Signed-off-by: Lauro Salmito <laurosalmito@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/power/cpu_32.c | 6 | ||||
| -rw-r--r-- | arch/x86/power/cpu_64.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c index ce702c5b3a2c..12a9c871d2ec 100644 --- a/arch/x86/power/cpu_32.c +++ b/arch/x86/power/cpu_32.c @@ -7,9 +7,13 @@ * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> */ -#include <linux/module.h> #include <linux/suspend.h> +#include <linux/smp.h> + +#include <asm/pgtable.h> +#include <asm/proto.h> #include <asm/mtrr.h> +#include <asm/page.h> #include <asm/mce.h> #include <asm/xcr.h> #include <asm/suspend.h> diff --git a/arch/x86/power/cpu_64.c b/arch/x86/power/cpu_64.c index 5343540f2607..39b27b72e3c5 100644 --- a/arch/x86/power/cpu_64.c +++ b/arch/x86/power/cpu_64.c @@ -8,12 +8,14 @@ * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> */ -#include <linux/smp.h> #include <linux/suspend.h> -#include <asm/proto.h> -#include <asm/page.h> +#include <linux/smp.h> + #include <asm/pgtable.h> +#include <asm/proto.h> #include <asm/mtrr.h> +#include <asm/page.h> +#include <asm/mce.h> #include <asm/xcr.h> #include <asm/suspend.h> |