diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /arch/ppc/syslib/mpc8xx_sys.c | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/ppc/syslib/mpc8xx_sys.c')
| -rw-r--r-- | arch/ppc/syslib/mpc8xx_sys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mpc8xx_sys.c b/arch/ppc/syslib/mpc8xx_sys.c index eee21328485..18ba1d7ff9f 100644 --- a/arch/ppc/syslib/mpc8xx_sys.c +++ b/arch/ppc/syslib/mpc8xx_sys.c @@ -22,7 +22,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { .ppc_sys_name = "MPC86X", .mask = 0xFFFFFFFF, .value = 0x00000000, - .num_devices = 7, + .num_devices = 8, .device_list = (enum ppc_sys_devices[]) { MPC8xx_CPM_FEC1, @@ -32,13 +32,14 @@ struct ppc_sys_spec ppc_sys_specs[] = { MPC8xx_CPM_SCC4, MPC8xx_CPM_SMC1, MPC8xx_CPM_SMC2, + MPC8xx_MDIO_FEC, }, }, { .ppc_sys_name = "MPC885", .mask = 0xFFFFFFFF, .value = 0x00000000, - .num_devices = 8, + .num_devices = 9, .device_list = (enum ppc_sys_devices[]) { MPC8xx_CPM_FEC1, @@ -49,6 +50,7 @@ struct ppc_sys_spec ppc_sys_specs[] = { MPC8xx_CPM_SCC4, MPC8xx_CPM_SMC1, MPC8xx_CPM_SMC2, + MPC8xx_MDIO_FEC, }, }, { /* default match */ |