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 | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
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[] = { | |||
| 218 | }, | 218 | }, |
| 219 | }, | 219 | }, |
| 220 | }, | 220 | }, |
| 221 | |||
| 222 | [MPC8xx_MDIO_FEC] = { | ||
| 223 | .name = "fsl-cpm-fec-mdio", | ||
| 224 | .id = 0, | ||
| 225 | .num_resources = 0, | ||
| 226 | |||
| 227 | }, | ||
| 228 | |||
| 221 | }; | 229 | }; |
| 222 | 230 | ||
| 223 | static int __init mach_mpc8xx_fixup(struct platform_device *pdev) | 231 | static int __init mach_mpc8xx_fixup(struct platform_device *pdev) |