diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
| commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
| tree | b3ff509f21352ef053cb3d490cb13528090d32ac /arch/ppc/syslib/cpm2_common.c | |
| parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
| parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 | ||