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/pSeries_setup.c | |
| parent | beeca08738c4c4024c81a591812bfe38f8c436c0 (diff) | |
| parent | 252e75a51d40757928d692b3d339e66838294b4b (diff) | |
Merge Stephen Rothwell's patches
Diffstat (limited to 'arch/ppc64/kernel/pSeries_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index b9bcff21b463..5a9fe96f9f67 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/ppc64/kernel/pSeries_setup.c | |||
| @@ -63,9 +63,9 @@ | |||
| 63 | #include <asm/firmware.h> | 63 | #include <asm/firmware.h> |
| 64 | #include <asm/pmc.h> | 64 | #include <asm/pmc.h> |
| 65 | #include <asm/mpic.h> | 65 | #include <asm/mpic.h> |
| 66 | #include <asm/ppc-pci.h> | ||
| 66 | 67 | ||
| 67 | #include "i8259.h" | 68 | #include "i8259.h" |
| 68 | #include "pci.h" | ||
| 69 | 69 | ||
| 70 | #ifdef DEBUG | 70 | #ifdef DEBUG |
| 71 | #define DBG(fmt...) udbg_printf(fmt) | 71 | #define DBG(fmt...) udbg_printf(fmt) |