diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /arch/ppc/syslib/cpm2_common.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/cpm2_common.c')
| -rw-r--r-- | arch/ppc/syslib/cpm2_common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/syslib/cpm2_common.c b/arch/ppc/syslib/cpm2_common.c index 4c19a4ac7163..cbac44b1620c 100644 --- a/arch/ppc/syslib/cpm2_common.c +++ b/arch/ppc/syslib/cpm2_common.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/mpc8260.h> | 27 | #include <asm/mpc8260.h> |
| 28 | #include <asm/page.h> | 28 | #include <asm/page.h> |
| 29 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
| 30 | #include <asm/immap_cpm2.h> | ||
| 31 | #include <asm/cpm2.h> | 30 | #include <asm/cpm2.h> |
| 32 | #include <asm/rheap.h> | 31 | #include <asm/rheap.h> |
| 33 | 32 | ||