diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /arch/x86/pci/amd_bus.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'arch/x86/pci/amd_bus.c')
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index 22e057665e55..9bb09823b362 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 3 | #include <linux/topology.h> | 3 | #include <linux/topology.h> |
| 4 | #include <linux/cpu.h> | 4 | #include <linux/cpu.h> |
| 5 | #include "pci.h" | 5 | #include <asm/pci_x86.h> |
| 6 | 6 | ||
| 7 | #ifdef CONFIG_X86_64 | 7 | #ifdef CONFIG_X86_64 |
| 8 | #include <asm/pci-direct.h> | 8 | #include <asm/pci-direct.h> |