diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /arch/ppc/syslib/cpm2_common.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
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 | ||