4 files changed, 6 insertions, 6 deletions
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 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 #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 @@
 * This version of the driver is somewhat selectable for the different
 * processor/board combinations.  It works for the boards I know about
 * now, and should be easily modified to include others.  Some of the
- * configuration information is contained in <asm/commproc.h> and the
+ * configuration information is contained in <asm/cpm1.h> and the
 * remainder is here.
 *
 * Buffer descriptors are kept in the CPM dual port RAM, and the frame
@@ -43,7 +43,7 @@
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 #include <asm/cacheflush.h>
 /*
@@ -80,7 +80,7 @@
 * programming documents for details unique to your board.
 *
 * For the TQM8xx(L) modules, there is no control register interface.
- * All functions are directly controlled using I/O pins.  See <asm/commproc.h>.
+ * All functions are directly controlled using I/O pins.  See <asm/cpm1.h>.
 */
 /* 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 @@
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 #ifdef  CONFIG_USE_MDIO
 /* 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 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 /*
 * I2C/SPI relocation patch arrays.

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.