diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 12:59:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 12:59:36 +0300 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /arch/x86/pci/olpc.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
| download | linux-4010b0192ddf6ec7ec1b9feb9b0953692aeb7329.tar.xz | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'arch/x86/pci/olpc.c')
| -rw-r--r-- | arch/x86/pci/olpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index e11e9e803d5f..b889d824f7c6 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c @@ -29,7 +29,7 @@ #include <linux/init.h> #include <asm/olpc.h> #include <asm/geode.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * In the tables below, the first two line (8 longwords) are the |