diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /arch/x86/pci/early.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'arch/x86/pci/early.c')
| -rw-r--r-- | arch/x86/pci/early.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index 86631ccbc25a..f6adf2c6d751 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 3 | #include <asm/pci-direct.h> | 3 | #include <asm/pci-direct.h> |
| 4 | #include <asm/io.h> | 4 | #include <asm/io.h> |
| 5 | #include "pci.h" | 5 | #include <asm/pci_x86.h> |
| 6 | 6 | ||
| 7 | /* Direct PCI access. This is used for PCI accesses in early boot before | 7 | /* Direct PCI access. This is used for PCI accesses in early boot before |
| 8 | the PCI subsystem works. */ | 8 | the PCI subsystem works. */ |