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 /arch/ppc/boot/simple | |
| parent | [POWERPC] 8xx: Get rid of conditional includes of board specific setup (diff) | |
| download | linux-dev-b5677d848cbb94220ac2cfd36d93bcdbe49c3280.tar.xz linux-dev-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 'arch/ppc/boot/simple')
| -rw-r--r-- | arch/ppc/boot/simple/iic.c | 2 | ||||
| -rw-r--r-- | arch/ppc/boot/simple/m8xx_tty.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/boot/simple/iic.c b/arch/ppc/boot/simple/iic.c index e4efd838bfaa..5e91489426b4 100644 --- a/arch/ppc/boot/simple/iic.c +++ b/arch/ppc/boot/simple/iic.c @@ -5,7 +5,7 @@ #include <linux/types.h> #include <asm/uaccess.h> #include <asm/mpc8xx.h> -#include <asm/commproc.h> +#include <asm/cpm1.h> /* IIC functions. diff --git a/arch/ppc/boot/simple/m8xx_tty.c b/arch/ppc/boot/simple/m8xx_tty.c index ea615d8ca541..f28924e6aeb4 100644 --- a/arch/ppc/boot/simple/m8xx_tty.c +++ b/arch/ppc/boot/simple/m8xx_tty.c @@ -11,7 +11,7 @@ #include <linux/types.h> #include <asm/uaccess.h> #include <asm/mpc8xx.h> -#include <asm/commproc.h> +#include <asm/cpm1.h> #ifdef CONFIG_MBX #define MBX_CSR1 ((volatile u_char *)0xfa100000) |