diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 23:09:59 +0300 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 23:09:59 +0300 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /arch/mips/momentum/ocelot_3/platform.c | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
| download | linux-48c871c1f6a7c7044dd76774fb469e65c7e2e4e8.tar.xz | |
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 = { static struct platform_device eth2_device = { .name = MV643XX_ETH_NAME, - .id = 1, + .id = 2, .num_resources = ARRAY_SIZE(mv64x60_eth2_resources), .resource = mv64x60_eth2_resources, .dev = { |