diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
| commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
| tree | 79922936e8cde867ba90d753f79aa61f575e162b /include/asm-ppc/mpc8xx.h | |
| parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
| parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
Merge branch 'upstream-fixes' into upstream
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 | ||