diff options
| author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2008-12-27 18:32:28 +0530 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 18:17:36 +0100 |
| commit | 824877111cd7f2b4fd2fe6947c5c5cbbb3ac5bd8 (patch) | |
| tree | 4dabc2c724815a12a756947b45491b2af33737b2 /arch/x86/kernel | |
| 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')
| -rw-r--r-- | arch/x86/kernel/mmconf-fam10h_64.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/reboot.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c index efc2f361fe8..666e43df51f 100644 --- a/arch/x86/kernel/mmconf-fam10h_64.c +++ b/arch/x86/kernel/mmconf-fam10h_64.c @@ -13,8 +13,7 @@ #include <asm/msr.h> #include <asm/acpi.h> #include <asm/mmconfig.h> - -#include "../pci/pci.h" +#include <asm/pci_x86.h> struct pci_hostbridge_probe { u32 bus; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index b165eb0884e..a90913cccfb 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -12,6 +12,7 @@ #include <asm/proto.h> #include <asm/reboot_fixups.h> #include <asm/reboot.h> +#include <asm/pci_x86.h> #ifdef CONFIG_X86_32 # include <linux/dmi.h> @@ -22,8 +23,6 @@ #endif #include <mach_ipi.h> -#include "../pci/pci.h" - /* * Power off function, if any |