diff options
author | Jochen Friedrich <jochen@scram.de> | 2008-01-25 15:31:42 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 08:31:05 -0600 |
commit | b5677d848cbb94220ac2cfd36d93bcdbe49c3280 (patch) | |
tree | 608c92fa1b90b5d0918c66402aacc66c0b813d81 /include/asm-powerpc | |
parent | 02753cb608cc2c35dbe670b466eb3b88d063b42e (diff) | |
download | linux-b5677d848cbb94220ac2cfd36d93bcdbe49c3280.tar.gz linux-b5677d848cbb94220ac2cfd36d93bcdbe49c3280.tar.bz2 linux-b5677d848cbb94220ac2cfd36d93bcdbe49c3280.zip |
[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c
Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also
rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the
includes accordingly.
Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/cpm1.h (renamed from include/asm-powerpc/commproc.h) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/cpm1.h index ec87b8fff075..901a00b48959 100644 --- a/include/asm-powerpc/commproc.h +++ b/include/asm-powerpc/cpm1.h @@ -14,8 +14,8 @@ * IDMA1 space. The remaining DP RAM is available for buffer descriptors * or other use. */ -#ifndef __CPM_8XX__ -#define __CPM_8XX__ +#ifndef __CPM1__ +#define __CPM1__ #include <asm/8xx_immap.h> #include <asm/ptrace.h> @@ -82,7 +82,7 @@ extern int cpm_dpfree(unsigned long offset); extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); extern void cpm_dpdump(void); extern void *cpm_dpram_addr(unsigned long offset); -extern uint cpm_dpram_phys(u8* addr); +extern uint cpm_dpram_phys(u8 *addr); #endif extern void cpm_setbrg(uint brg, uint rate); @@ -747,4 +747,4 @@ enum cpm_clk { int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode); -#endif /* __CPM_8XX__ */ +#endif /* __CPM1__ */ |