diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /arch/ppc/syslib/mpc8xx_devices.c | |
parent | [GFS2] Allow mounting of gfs2 and gfs2meta at the same time (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
download | linux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.tar.xz linux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.zip |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/ppc/syslib/mpc8xx_devices.c')
-rw-r--r-- | arch/ppc/syslib/mpc8xx_devices.c | 8 |
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) |