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 /include/asm-ppc/mpc8xx.h | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'master' into gfs2
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 | ||