diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 09:59:36 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 09:59:36 (GMT) |
commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /arch/x86/pci/fixup.c | |
parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
download | linux-fsl-qoriq-4010b0192ddf6ec7ec1b9feb9b0953692aeb7329.tar.xz |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'arch/x86/pci/fixup.c')
-rw-r--r-- | arch/x86/pci/fixup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 2051dc9..7d388d5 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -6,8 +6,7 @@ #include <linux/dmi.h> #include <linux/pci.h> #include <linux/init.h> -#include "pci.h" - +#include <asm/pci_x86.h> static void __devinit pci_fixup_i450nx(struct pci_dev *d) { |