diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /arch/mips/momentum/ocelot_3/platform.c | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
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 = { |