diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/mips/momentum/ocelot_3/platform.c | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'arch/mips/momentum/ocelot_3/platform.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_3/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c index eefe5841fbb2..57cfe5c6e4a8 100644 --- a/arch/mips/momentum/ocelot_3/platform.c +++ b/arch/mips/momentum/ocelot_3/platform.c | |||
| @@ -129,7 +129,7 @@ static struct mv643xx_eth_platform_data eth2_pd = { | |||
| 129 | 129 | ||
| 130 | static struct platform_device eth2_device = { | 130 | static struct platform_device eth2_device = { |
| 131 | .name = MV643XX_ETH_NAME, | 131 | .name = MV643XX_ETH_NAME, |
| 132 | .id = 1, | 132 | .id = 2, |
| 133 | .num_resources = ARRAY_SIZE(mv64x60_eth2_resources), | 133 | .num_resources = ARRAY_SIZE(mv64x60_eth2_resources), |
| 134 | .resource = mv64x60_eth2_resources, | 134 | .resource = mv64x60_eth2_resources, |
| 135 | .dev = { | 135 | .dev = { |