Merge branch 'linux-2.6'

[sfrench/cifs-2.6.git] / arch / ppc / syslib / mpc8xx_devices.c

diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index c05ac87ece4cb9516489e61b6ad1f1e3fb01ccc7..80804eee5795937af05a7ff13e5a5592f63a3005 100644 (file)
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -16,7 +16,7 @@
 #include <linux/device.h>
 #include <linux/serial_8250.h>
 #include <linux/mii.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
 #include <asm/ppc_sys.h>