aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/power
diff options
context:
space:
mode:
authorSergio Luis <sergio@larces.uece.br>2009-04-27 18:26:22 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-06-12 15:32:29 -0400
commitf6783d20d4b85b360b4a6f86bdbd9282a4a7004c (patch)
treebe697adb8ccf61fda9341d43bc85da93c8c34a36 /arch/x86/power
parent62b0124761b9c2e304ee07dcf4db46c4a3dfec11 (diff)
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/x86/power')
-rw-r--r--arch/x86/power/cpu_32.c6
-rw-r--r--arch/x86/power/cpu_64.c8
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 @@
7 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> 7 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
8 */ 8 */
9 9
10#include <linux/module.h>
11#include <linux/suspend.h> 10#include <linux/suspend.h>
11#include <linux/smp.h>
12
13#include <asm/pgtable.h>
14#include <asm/proto.h>
12#include <asm/mtrr.h> 15#include <asm/mtrr.h>
16#include <asm/page.h>
13#include <asm/mce.h> 17#include <asm/mce.h>
14#include <asm/xcr.h> 18#include <asm/xcr.h>
15#include <asm/suspend.h> 19#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 @@
8 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> 8 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
9 */ 9 */
10 10
11#include <linux/smp.h>
12#include <linux/suspend.h> 11#include <linux/suspend.h>
13#include <asm/proto.h> 12#include <linux/smp.h>
14#include <asm/page.h> 13
15#include <asm/pgtable.h> 14#include <asm/pgtable.h>
15#include <asm/proto.h>
16#include <asm/mtrr.h> 16#include <asm/mtrr.h>
17#include <asm/page.h>
18#include <asm/mce.h>
17#include <asm/xcr.h> 19#include <asm/xcr.h>
18#include <asm/suspend.h> 20#include <asm/suspend.h>
19 21