aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/8xx/ep88xc.c1
-rw-r--r--arch/powerpc/platforms/8xx/mpc86xads_setup.c2
-rw-r--r--arch/powerpc/platforms/8xx/mpc885ads_setup.c2
-rw-r--r--arch/powerpc/sysdev/Makefile4
-rw-r--r--arch/powerpc/sysdev/cpm1.c (renamed from arch/powerpc/sysdev/commproc.c)4
-rw-r--r--arch/powerpc/sysdev/cpm2.c (renamed from arch/powerpc/sysdev/cpm2_common.c)3
-rw-r--r--arch/powerpc/sysdev/micropatch.c2
-rw-r--r--arch/ppc/8260_io/enet.c2
-rw-r--r--arch/ppc/8xx_io/commproc.c2
-rw-r--r--arch/ppc/8xx_io/enet.c6
-rw-r--r--arch/ppc/8xx_io/fec.c2
-rw-r--r--arch/ppc/8xx_io/micropatch.c2
-rw-r--r--arch/ppc/boot/simple/iic.c2
-rw-r--r--arch/ppc/boot/simple/m8xx_tty.c2
-rw-r--r--arch/ppc/kernel/ppc_ksyms.c2
-rw-r--r--arch/ppc/platforms/mpc866ads_setup.c2
-rw-r--r--arch/ppc/platforms/mpc885ads_setup.c2
-rw-r--r--arch/ppc/syslib/mpc8xx_devices.c2
-rw-r--r--arch/ppc/xmon/start_8xx.c2
-rw-r--r--drivers/net/fec_8xx/fec_8xx-netta.c2
-rw-r--r--drivers/net/fec_8xx/fec_main.c2
-rw-r--r--drivers/net/fec_8xx/fec_mii.c2
-rw-r--r--drivers/net/fs_enet/fs_enet.h2
-rw-r--r--drivers/net/fs_enet/mac-fec.c2
-rw-r--r--drivers/net/fs_enet/mac-scc.c2
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm1.h2
-rw-r--r--include/asm-powerpc/cpm1.h (renamed from include/asm-powerpc/commproc.h)8
-rw-r--r--include/asm-ppc/cpm1.h (renamed from include/asm-ppc/commproc.h)8
28 files changed, 38 insertions, 38 deletions
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index 4897edab1ae1..a8dffa005775 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -16,6 +16,7 @@
16#include <asm/io.h> 16#include <asm/io.h>
17#include <asm/udbg.h> 17#include <asm/udbg.h>
18#include <asm/commproc.h> 18#include <asm/commproc.h>
19#include <asm/cpm1.h>
19 20
20#include "mpc8xx.h" 21#include "mpc8xx.h"
21 22
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index c0dda534f44d..c028a5b71bbb 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -22,7 +22,7 @@
22#include <asm/system.h> 22#include <asm/system.h>
23#include <asm/time.h> 23#include <asm/time.h>
24#include <asm/8xx_immap.h> 24#include <asm/8xx_immap.h>
25#include <asm/commproc.h> 25#include <asm/cpm1.h>
26#include <asm/fs_pd.h> 26#include <asm/fs_pd.h>
27#include <asm/udbg.h> 27#include <asm/udbg.h>
28 28
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 3be115e525fc..6e7ded0233f6 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -36,7 +36,7 @@
36#include <asm/time.h> 36#include <asm/time.h>
37#include <asm/mpc8xx.h> 37#include <asm/mpc8xx.h>
38#include <asm/8xx_immap.h> 38#include <asm/8xx_immap.h>
39#include <asm/commproc.h> 39#include <asm/cpm1.h>
40#include <asm/fs_pd.h> 40#include <asm/fs_pd.h>
41#include <asm/udbg.h> 41#include <asm/udbg.h>
42 42
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 702916bf28fa..15f3e8527d77 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -37,8 +37,8 @@ endif
37# Temporary hack until we have migrated to asm-powerpc 37# Temporary hack until we have migrated to asm-powerpc
38ifeq ($(ARCH),powerpc) 38ifeq ($(ARCH),powerpc)
39obj-$(CONFIG_CPM) += cpm_common.o 39obj-$(CONFIG_CPM) += cpm_common.o
40obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o 40obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
41obj-$(CONFIG_PPC_DCR) += dcr.o 41obj-$(CONFIG_PPC_DCR) += dcr.o
42obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o 42obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
43obj-$(CONFIG_UCODE_PATCH) += micropatch.o 43obj-$(CONFIG_UCODE_PATCH) += micropatch.o
44endif 44endif
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/cpm1.c
index ef82587d4d28..df8bd2b64796 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -33,7 +33,7 @@
33#include <asm/page.h> 33#include <asm/page.h>
34#include <asm/pgtable.h> 34#include <asm/pgtable.h>
35#include <asm/8xx_immap.h> 35#include <asm/8xx_immap.h>
36#include <asm/commproc.h> 36#include <asm/cpm1.h>
37#include <asm/io.h> 37#include <asm/io.h>
38#include <asm/tlbflush.h> 38#include <asm/tlbflush.h>
39#include <asm/rheap.h> 39#include <asm/rheap.h>
@@ -290,7 +290,7 @@ cpm_setbrg(uint brg, uint rate)
290 out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN); 290 out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
291 else 291 else
292 out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) | 292 out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
293 CPM_BRG_EN | CPM_BRG_DIV16); 293 CPM_BRG_EN | CPM_BRG_DIV16);
294} 294}
295 295
296#ifndef CONFIG_PPC_CPM_NEW_BINDING 296#ifndef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2.c
index f7188e2ba669..7be711232124 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -153,8 +153,7 @@ cpm2_fastbrg(uint brg, uint rate, int div16)
153 153
154 if (brg < 4) { 154 if (brg < 4) {
155 bp = cpm2_map_size(im_brgc1, 16); 155 bp = cpm2_map_size(im_brgc1, 16);
156 } 156 } else {
157 else {
158 bp = cpm2_map_size(im_brgc5, 16); 157 bp = cpm2_map_size(im_brgc5, 16);
159 brg -= 4; 158 brg -= 4;
160 } 159 }
diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index 712b10a55f87..d8d602840757 100644
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -16,7 +16,7 @@
16#include <asm/page.h> 16#include <asm/page.h>
17#include <asm/pgtable.h> 17#include <asm/pgtable.h>
18#include <asm/8xx_immap.h> 18#include <asm/8xx_immap.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20 20
21/* 21/*
22 * I2C/SPI relocation patch arrays. 22 * I2C/SPI relocation patch arrays.
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 615b6583d9b0..3ea4db2cc9e9 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -10,7 +10,7 @@
10 * This version of the driver is somewhat selectable for the different 10 * This version of the driver is somewhat selectable for the different
11 * processor/board combinations. It works for the boards I know about 11 * processor/board combinations. It works for the boards I know about
12 * now, and should be easily modified to include others. Some of the 12 * now, and should be easily modified to include others. Some of the
13 * configuration information is contained in <asm/commproc.h> and the 13 * configuration information is contained in <asm/cpm1.h> and the
14 * remainder is here. 14 * remainder is here.
15 * 15 *
16 * Buffer descriptors are kept in the CPM dual port RAM, and the frame 16 * Buffer descriptors are kept in the CPM dual port RAM, and the frame
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 3f93af83b514..9d656de0f0f1 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -34,7 +34,7 @@
34#include <asm/page.h> 34#include <asm/page.h>
35#include <asm/pgtable.h> 35#include <asm/pgtable.h>
36#include <asm/8xx_immap.h> 36#include <asm/8xx_immap.h>
37#include <asm/commproc.h> 37#include <asm/cpm1.h>
38#include <asm/io.h> 38#include <asm/io.h>
39#include <asm/tlbflush.h> 39#include <asm/tlbflush.h>
40#include <asm/rheap.h> 40#include <asm/rheap.h>
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index eace3bc118d2..c6d047ae77ac 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -8,7 +8,7 @@
8 * This version of the driver is somewhat selectable for the different 8 * This version of the driver is somewhat selectable for the different
9 * processor/board combinations. It works for the boards I know about 9 * processor/board combinations. It works for the boards I know about
10 * now, and should be easily modified to include others. Some of the 10 * now, and should be easily modified to include others. Some of the
11 * configuration information is contained in <asm/commproc.h> and the 11 * configuration information is contained in <asm/cpm1.h> and the
12 * remainder is here. 12 * remainder is here.
13 * 13 *
14 * Buffer descriptors are kept in the CPM dual port RAM, and the frame 14 * Buffer descriptors are kept in the CPM dual port RAM, and the frame
@@ -43,7 +43,7 @@
43#include <asm/pgtable.h> 43#include <asm/pgtable.h>
44#include <asm/mpc8xx.h> 44#include <asm/mpc8xx.h>
45#include <asm/uaccess.h> 45#include <asm/uaccess.h>
46#include <asm/commproc.h> 46#include <asm/cpm1.h>
47#include <asm/cacheflush.h> 47#include <asm/cacheflush.h>
48 48
49/* 49/*
@@ -80,7 +80,7 @@
80 * programming documents for details unique to your board. 80 * programming documents for details unique to your board.
81 * 81 *
82 * For the TQM8xx(L) modules, there is no control register interface. 82 * For the TQM8xx(L) modules, there is no control register interface.
83 * All functions are directly controlled using I/O pins. See <asm/commproc.h>. 83 * All functions are directly controlled using I/O pins. See <asm/cpm1.h>.
84 */ 84 */
85 85
86/* The transmitter timeout 86/* The transmitter timeout
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 0288279be9aa..11b0aa6ca97e 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -53,7 +53,7 @@
53#include <asm/mpc8xx.h> 53#include <asm/mpc8xx.h>
54#include <asm/irq.h> 54#include <asm/irq.h>
55#include <asm/uaccess.h> 55#include <asm/uaccess.h>
56#include <asm/commproc.h> 56#include <asm/cpm1.h>
57 57
58#ifdef CONFIG_USE_MDIO 58#ifdef CONFIG_USE_MDIO
59/* Forward declarations of some structures to support different PHYs 59/* Forward declarations of some structures to support different PHYs
diff --git a/arch/ppc/8xx_io/micropatch.c b/arch/ppc/8xx_io/micropatch.c
index cfad46ba17e3..9a5d95da7c28 100644
--- a/arch/ppc/8xx_io/micropatch.c
+++ b/arch/ppc/8xx_io/micropatch.c
@@ -16,7 +16,7 @@
16#include <asm/page.h> 16#include <asm/page.h>
17#include <asm/pgtable.h> 17#include <asm/pgtable.h>
18#include <asm/8xx_immap.h> 18#include <asm/8xx_immap.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20 20
21/* 21/*
22 * I2C/SPI relocation patch arrays. 22 * I2C/SPI relocation patch arrays.
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 @@
5#include <linux/types.h> 5#include <linux/types.h>
6#include <asm/uaccess.h> 6#include <asm/uaccess.h>
7#include <asm/mpc8xx.h> 7#include <asm/mpc8xx.h>
8#include <asm/commproc.h> 8#include <asm/cpm1.h>
9 9
10 10
11/* IIC functions. 11/* 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 @@
11#include <linux/types.h> 11#include <linux/types.h>
12#include <asm/uaccess.h> 12#include <asm/uaccess.h>
13#include <asm/mpc8xx.h> 13#include <asm/mpc8xx.h>
14#include <asm/commproc.h> 14#include <asm/cpm1.h>
15 15
16#ifdef CONFIG_MBX 16#ifdef CONFIG_MBX
17#define MBX_CSR1 ((volatile u_char *)0xfa100000) 17#define MBX_CSR1 ((volatile u_char *)0xfa100000)
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 22494ec123ea..0d53dc378c7d 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -45,7 +45,7 @@
45#include <asm/dcr.h> 45#include <asm/dcr.h>
46 46
47#ifdef CONFIG_8xx 47#ifdef CONFIG_8xx
48#include <asm/commproc.h> 48#include <asm/cpm1.h>
49#endif 49#endif
50 50
51extern void transfer_to_handler(void); 51extern void transfer_to_handler(void);
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
index bf72204125c5..62370f4a5a0f 100644
--- a/arch/ppc/platforms/mpc866ads_setup.c
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -32,7 +32,7 @@
32#include <asm/time.h> 32#include <asm/time.h>
33#include <asm/ppcboot.h> 33#include <asm/ppcboot.h>
34#include <asm/8xx_immap.h> 34#include <asm/8xx_immap.h>
35#include <asm/commproc.h> 35#include <asm/cpm1.h>
36#include <asm/ppc_sys.h> 36#include <asm/ppc_sys.h>
37#include <asm/mpc8xx.h> 37#include <asm/mpc8xx.h>
38 38
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c
index 87deaefd6c5b..ba06cc08cdab 100644
--- a/arch/ppc/platforms/mpc885ads_setup.c
+++ b/arch/ppc/platforms/mpc885ads_setup.c
@@ -31,7 +31,7 @@
31#include <asm/time.h> 31#include <asm/time.h>
32#include <asm/ppcboot.h> 32#include <asm/ppcboot.h>
33#include <asm/8xx_immap.h> 33#include <asm/8xx_immap.h>
34#include <asm/commproc.h> 34#include <asm/cpm1.h>
35#include <asm/ppc_sys.h> 35#include <asm/ppc_sys.h>
36 36
37extern unsigned char __res[]; 37extern unsigned char __res[];
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index c05ac87ece4c..80804eee5795 100644
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -16,7 +16,7 @@
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/serial_8250.h> 17#include <linux/serial_8250.h>
18#include <linux/mii.h> 18#include <linux/mii.h>
19#include <asm/commproc.h> 19#include <asm/cpm1.h>
20#include <asm/mpc8xx.h> 20#include <asm/mpc8xx.h>
21#include <asm/irq.h> 21#include <asm/irq.h>
22#include <asm/ppc_sys.h> 22#include <asm/ppc_sys.h>
diff --git a/arch/ppc/xmon/start_8xx.c b/arch/ppc/xmon/start_8xx.c
index a48bd594cf61..30974068c223 100644
--- a/arch/ppc/xmon/start_8xx.c
+++ b/arch/ppc/xmon/start_8xx.c
@@ -14,7 +14,7 @@
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <asm/8xx_immap.h> 15#include <asm/8xx_immap.h>
16#include <asm/mpc8xx.h> 16#include <asm/mpc8xx.h>
17#include <asm/commproc.h> 17#include <asm/cpm1.h>
18 18
19extern void xmon_printf(const char *fmt, ...); 19extern void xmon_printf(const char *fmt, ...);
20extern int xmon_8xx_write(char *str, int nb); 20extern int xmon_8xx_write(char *str, int nb);
diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c
index e492eb84f948..79deee222e28 100644
--- a/drivers/net/fec_8xx/fec_8xx-netta.c
+++ b/drivers/net/fec_8xx/fec_8xx-netta.c
@@ -26,7 +26,7 @@
26#include <asm/mpc8xx.h> 26#include <asm/mpc8xx.h>
27#include <asm/irq.h> 27#include <asm/irq.h>
28#include <asm/uaccess.h> 28#include <asm/uaccess.h>
29#include <asm/commproc.h> 29#include <asm/cpm1.h>
30 30
31#include "fec_8xx.h" 31#include "fec_8xx.h"
32 32
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index ab9637ab3a8d..ca8d2e83ab03 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -35,7 +35,7 @@
35#include <asm/mpc8xx.h> 35#include <asm/mpc8xx.h>
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/uaccess.h> 37#include <asm/uaccess.h>
38#include <asm/commproc.h> 38#include <asm/cpm1.h>
39 39
40#include "fec_8xx.h" 40#include "fec_8xx.h"
41 41
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index e8e10a02d202..3b6ca29d31f2 100644
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -34,7 +34,7 @@
34#include <asm/mpc8xx.h> 34#include <asm/mpc8xx.h>
35#include <asm/irq.h> 35#include <asm/irq.h>
36#include <asm/uaccess.h> 36#include <asm/uaccess.h>
37#include <asm/commproc.h> 37#include <asm/cpm1.h>
38 38
39/*************************************************/ 39/*************************************************/
40 40
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index c675e29aadcc..e05389c49bbb 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -12,7 +12,7 @@
12#include <asm/fs_pd.h> 12#include <asm/fs_pd.h>
13 13
14#ifdef CONFIG_CPM1 14#ifdef CONFIG_CPM1
15#include <asm/commproc.h> 15#include <asm/cpm1.h>
16 16
17struct fec_info { 17struct fec_info {
18 fec_t __iomem *fecp; 18 fec_t __iomem *fecp;
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index c1fee48517e3..8a311d1e435b 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -40,7 +40,7 @@
40#include <asm/8xx_immap.h> 40#include <asm/8xx_immap.h>
41#include <asm/pgtable.h> 41#include <asm/pgtable.h>
42#include <asm/mpc8xx.h> 42#include <asm/mpc8xx.h>
43#include <asm/commproc.h> 43#include <asm/cpm1.h>
44#endif 44#endif
45 45
46#ifdef CONFIG_PPC_CPM_NEW_BINDING 46#ifdef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index fe3d8a621c33..d7ca31945c82 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -40,7 +40,7 @@
40#include <asm/8xx_immap.h> 40#include <asm/8xx_immap.h>
41#include <asm/pgtable.h> 41#include <asm/pgtable.h>
42#include <asm/mpc8xx.h> 42#include <asm/mpc8xx.h>
43#include <asm/commproc.h> 43#include <asm/cpm1.h>
44#endif 44#endif
45 45
46#ifdef CONFIG_PPC_CPM_NEW_BINDING 46#ifdef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 9b5465fb0bbb..ddf46d3c964b 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -10,7 +10,7 @@
10#ifndef CPM_UART_CPM1_H 10#ifndef CPM_UART_CPM1_H
11#define CPM_UART_CPM1_H 11#define CPM_UART_CPM1_H
12 12
13#include <asm/commproc.h> 13#include <asm/cpm1.h>
14 14
15/* defines for IRQs */ 15/* defines for IRQs */
16#ifndef CONFIG_PPC_CPM_NEW_BINDING 16#ifndef CONFIG_PPC_CPM_NEW_BINDING
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 @@
14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors 14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors
15 * or other use. 15 * or other use.
16 */ 16 */
17#ifndef __CPM_8XX__ 17#ifndef __CPM1__
18#define __CPM_8XX__ 18#define __CPM1__
19 19
20#include <asm/8xx_immap.h> 20#include <asm/8xx_immap.h>
21#include <asm/ptrace.h> 21#include <asm/ptrace.h>
@@ -82,7 +82,7 @@ extern int cpm_dpfree(unsigned long offset);
82extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); 82extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
83extern void cpm_dpdump(void); 83extern void cpm_dpdump(void);
84extern void *cpm_dpram_addr(unsigned long offset); 84extern void *cpm_dpram_addr(unsigned long offset);
85extern uint cpm_dpram_phys(u8* addr); 85extern uint cpm_dpram_phys(u8 *addr);
86#endif 86#endif
87 87
88extern void cpm_setbrg(uint brg, uint rate); 88extern void cpm_setbrg(uint brg, uint rate);
@@ -747,4 +747,4 @@ enum cpm_clk {
747 747
748int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode); 748int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode);
749 749
750#endif /* __CPM_8XX__ */ 750#endif /* __CPM1__ */
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/cpm1.h
index 5418d6de1737..03035acd85c6 100644
--- a/include/asm-ppc/commproc.h
+++ b/include/asm-ppc/cpm1.h
@@ -14,8 +14,8 @@
14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors 14 * IDMA1 space. The remaining DP RAM is available for buffer descriptors
15 * or other use. 15 * or other use.
16 */ 16 */
17#ifndef __CPM_8XX__ 17#ifndef __CPM1__
18#define __CPM_8XX__ 18#define __CPM1__
19 19
20#include <asm/8xx_immap.h> 20#include <asm/8xx_immap.h>
21#include <asm/ptrace.h> 21#include <asm/ptrace.h>
@@ -72,7 +72,7 @@ extern int cpm_dpfree(unsigned long offset);
72extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); 72extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
73extern void cpm_dpdump(void); 73extern void cpm_dpdump(void);
74extern void *cpm_dpram_addr(unsigned long offset); 74extern void *cpm_dpram_addr(unsigned long offset);
75extern uint cpm_dpram_phys(u8* addr); 75extern uint cpm_dpram_phys(u8 *addr);
76extern void cpm_setbrg(uint brg, uint rate); 76extern void cpm_setbrg(uint brg, uint rate);
77 77
78extern void cpm_load_patch(volatile immap_t *immr); 78extern void cpm_load_patch(volatile immap_t *immr);
@@ -685,4 +685,4 @@ typedef struct risc_timer_pram {
685extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); 685extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
686extern void cpm_free_handler(int vec); 686extern void cpm_free_handler(int vec);
687 687
688#endif /* __CPM_8XX__ */ 688#endif /* __CPM1__ */