summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/mpc8xx_devices.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-19 17:45:11 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:45:11 -0400
commit846050dd49719b1f68248807bba5c27bfc86f81a (patch)
tree79922936e8cde867ba90d753f79aa61f575e162b /arch/ppc/syslib/mpc8xx_devices.c
parent49666145de54b5d6d256442bb1bec03ffae1ac76 (diff)
parent2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff)
downloadlinux-846050dd49719b1f68248807bba5c27bfc86f81a.tar.gz
linux-846050dd49719b1f68248807bba5c27bfc86f81a.tar.bz2
linux-846050dd49719b1f68248807bba5c27bfc86f81a.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/ppc/syslib/mpc8xx_devices.c')
-rw-r--r--arch/ppc/syslib/mpc8xx_devices.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index 6f536383866e..cf5ab47487a7 100644
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -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)