diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 07:11:41 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 07:11:41 -0400 |
| commit | 952ecef7a0479049c8abb7c34a688ec2981ceadd (patch) | |
| tree | 74377080bb1fe12e874d18cb77461341a904f854 /arch/ppc64/kernel/maple_pci.c | |
| parent | beeca08738c4c4024c81a591812bfe38f8c436c0 (diff) | |
| parent | 252e75a51d40757928d692b3d339e66838294b4b (diff) | |
Merge Stephen Rothwell's patches
Diffstat (limited to 'arch/ppc64/kernel/maple_pci.c')
| -rw-r--r-- | arch/ppc64/kernel/maple_pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/maple_pci.c b/arch/ppc64/kernel/maple_pci.c index 1d297e0edfc0..0937649f4961 100644 --- a/arch/ppc64/kernel/maple_pci.c +++ b/arch/ppc64/kernel/maple_pci.c | |||
| @@ -23,8 +23,7 @@ | |||
| 23 | #include <asm/pci-bridge.h> | 23 | #include <asm/pci-bridge.h> |
| 24 | #include <asm/machdep.h> | 24 | #include <asm/machdep.h> |
| 25 | #include <asm/iommu.h> | 25 | #include <asm/iommu.h> |
| 26 | 26 | #include <asm/ppc-pci.h> | |
| 27 | #include "pci.h" | ||
| 28 | 27 | ||
| 29 | #ifdef DEBUG | 28 | #ifdef DEBUG |
| 30 | #define DBG(x...) printk(x) | 29 | #define DBG(x...) printk(x) |