git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
mpc8xx_sys.c
diff --git
a/arch/ppc/syslib/mpc8xx_sys.c
b/arch/ppc/syslib/mpc8xx_sys.c
index
d3c6175
..
18ba1d7
100644
(file)
--- a/
arch/ppc/syslib/mpc8xx_sys.c
+++ b/
arch/ppc/syslib/mpc8xx_sys.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/mpc8xx_sys.c
- *
* MPC8xx System descriptions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
* MPC8xx System descriptions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@
-24,7
+22,7
@@
struct ppc_sys_spec ppc_sys_specs[] = {
.ppc_sys_name = "MPC86X",
.mask = 0xFFFFFFFF,
.value = 0x00000000,
.ppc_sys_name = "MPC86X",
.mask = 0xFFFFFFFF,
.value = 0x00000000,
- .num_devices =
7
,
+ .num_devices =
8
,
.device_list = (enum ppc_sys_devices[])
{
MPC8xx_CPM_FEC1,
.device_list = (enum ppc_sys_devices[])
{
MPC8xx_CPM_FEC1,
@@
-34,13
+32,14
@@
struct ppc_sys_spec ppc_sys_specs[] = {
MPC8xx_CPM_SCC4,
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
MPC8xx_CPM_SCC4,
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
+ MPC8xx_MDIO_FEC,
},
},
{
.ppc_sys_name = "MPC885",
.mask = 0xFFFFFFFF,
.value = 0x00000000,
},
},
{
.ppc_sys_name = "MPC885",
.mask = 0xFFFFFFFF,
.value = 0x00000000,
- .num_devices =
8
,
+ .num_devices =
9
,
.device_list = (enum ppc_sys_devices[])
{
MPC8xx_CPM_FEC1,
.device_list = (enum ppc_sys_devices[])
{
MPC8xx_CPM_FEC1,
@@
-51,6
+50,7
@@
struct ppc_sys_spec ppc_sys_specs[] = {
MPC8xx_CPM_SCC4,
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
MPC8xx_CPM_SCC4,
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
+ MPC8xx_MDIO_FEC,
},
},
{ /* default match */
},
},
{ /* default match */