diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 21:21:22 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 21:21:22 +0300 |
| commit | 45bfe98bd790b5ded00462cd582effcfb42263cc (patch) | |
| tree | d4a1f2c5303dda106635b615f8f40ea9104bf25e /arch/powerpc/platforms/iseries/pci.c | |
| parent | 9f5974c8734d83d4ab7096ed98136a82f41210d6 (diff) | |
| parent | 624cee31bcb14bfd85559fbec5dd7bb833542965 (diff) | |
| download | linux-45bfe98bd790b5ded00462cd582effcfb42263cc.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index dafc518fbb83..a19833b880e4 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -43,6 +43,7 @@ #include "irq.h" #include "pci.h" #include "call_pci.h" +#include "iommu.h" extern unsigned long io_page_mask; |