diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /include/asm-ppc/mpc8xx.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'include/asm-ppc/mpc8xx.h')
| -rw-r--r-- | include/asm-ppc/mpc8xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index adcce33f20ae..d3a2f2fe230c 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h | |||
| @@ -110,6 +110,7 @@ enum ppc_sys_devices { | |||
| 110 | MPC8xx_CPM_SMC1, | 110 | MPC8xx_CPM_SMC1, |
| 111 | MPC8xx_CPM_SMC2, | 111 | MPC8xx_CPM_SMC2, |
| 112 | MPC8xx_CPM_USB, | 112 | MPC8xx_CPM_USB, |
| 113 | MPC8xx_MDIO_FEC, | ||
| 113 | NUM_PPC_SYS_DEVS, | 114 | NUM_PPC_SYS_DEVS, |
| 114 | }; | 115 | }; |
| 115 | 116 | ||