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 6f536383866eddf8f32becbd3adb77435c27ac0a..80804eee5795937af05a7ff13e5a5592f63a3005 100644 (file)
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -16,12 +16,12 @@
 #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>
 
-/* We use offsets for IORESOURCE_MEM to do not set dependences at compile time.
+/* We use offsets for IORESOURCE_MEM to do not set dependencies at compile time.
  * They will get fixed up by mach_mpc8xx_fixup
  */
 
@@ -78,7 +78,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                        {
                                .name   = "pram",
                                .start  = 0x3c00,
-                               .end    = 0x3c80,
+                               .end    = 0x3c7f,
                                .flags  = IORESOURCE_MEM,
                        },
                        {
@@ -103,7 +103,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                        {
                                .name   = "pram",
                                .start  = 0x3d00,
-                               .end    = 0x3d80,
+                               .end    = 0x3d7f,
                                .flags  = IORESOURCE_MEM,
                        },
 
@@ -129,7 +129,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                        {
                                .name   = "pram",
                                .start  = 0x3e00,
-                               .end    = 0x3e80,
+                               .end    = 0x3e7f,
                                .flags  = IORESOURCE_MEM,
                        },
 
@@ -155,7 +155,7 @@ struct platform_device ppc_sys_platform_devices[] = {
                        {
                                .name   = "pram",
                                .start  = 0x3f00,
-                               .end    = 0x3f80,
+                               .end    = 0x3f7f,
                                .flags  = IORESOURCE_MEM,
                        },
 
@@ -218,6 +218,14 @@ struct platform_device ppc_sys_platform_devices[] = {
                        },
                },
        },
+
+        [MPC8xx_MDIO_FEC] = {
+                .name = "fsl-cpm-fec-mdio",
+                .id = 0,
+                .num_resources = 0,
+
+        },
+
 };
 
 static int __init mach_mpc8xx_fixup(struct platform_device *pdev)