diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-23 21:58:48 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-23 21:58:48 -0700 |
| commit | 20253de9d566f02b82aa1e0c103f73e80619106a (patch) | |
| tree | a91db957a3dd40469531f35a920b8302c03fb7ee /arch/ppc/syslib/mpc8xx_sys.c | |
| parent | b7277155f8fa89cd5696140b4a93cfb53d0091ff (diff) | |
| parent | 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (diff) | |
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 */ |