diff options
author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2008-12-27 08:02:28 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 12:17:36 -0500 |
commit | 824877111cd7f2b4fd2fe6947c5c5cbbb3ac5bd8 (patch) | |
tree | 4dabc2c724815a12a756947b45491b2af33737b2 /arch/x86/kernel/reboot.c | |
parent | c854c91979e0717c619bc55e124d41d60d5eb3d6 (diff) |
x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
Impact: cleanup
Now that arch/x86/pci/pci.h is used in a number of other places as well,
move the lowlevel x86 pci definitions into the architecture include files.
(not to be confused with the existing arch/x86/include/asm/pci.h file,
which provides public details about x86 PCI)
Tested on: X86_32_UP, X86_32_SMP and X86_64_SMP
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r-- | arch/x86/kernel/reboot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index b165eb0884ed..a90913cccfb7 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <asm/proto.h> | 12 | #include <asm/proto.h> |
13 | #include <asm/reboot_fixups.h> | 13 | #include <asm/reboot_fixups.h> |
14 | #include <asm/reboot.h> | 14 | #include <asm/reboot.h> |
15 | #include <asm/pci_x86.h> | ||
15 | 16 | ||
16 | #ifdef CONFIG_X86_32 | 17 | #ifdef CONFIG_X86_32 |
17 | # include <linux/dmi.h> | 18 | # include <linux/dmi.h> |
@@ -22,8 +23,6 @@ | |||
22 | #endif | 23 | #endif |
23 | 24 | ||
24 | #include <mach_ipi.h> | 25 | #include <mach_ipi.h> |
25 | #include "../pci/pci.h" | ||
26 | |||
27 | 26 | ||
28 | /* | 27 | /* |
29 | * Power off function, if any | 28 | * Power off function, if any |