diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-05-06 18:22:03 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-06 18:22:03 +0200 |
| commit | 54c852a2d61bb15d9b979410c2260edfb23d448c (patch) | |
| tree | 7a6ba9d1743b01090b85611cea9dd79ec2950487 /arch/ppc | |
| parent | fix warning in drivers/net/appletalk/cops.c (diff) | |
| parent | mv643xx_eth: inter-mv643xx SMI port sharing (diff) | |
| download | linux-54c852a2d61bb15d9b979410c2260edfb23d448c.tar.xz linux-54c852a2d61bb15d9b979410c2260edfb23d448c.zip | |
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/syslib/mv64x60.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c index 90fe904d3614..418f3053de52 100644 --- a/arch/ppc/syslib/mv64x60.c +++ b/arch/ppc/syslib/mv64x60.c @@ -341,6 +341,7 @@ static struct resource mv64x60_eth0_resources[] = { }; static struct mv643xx_eth_platform_data eth0_pd = { + .shared = &mv64x60_eth_shared_device; .port_number = 0, }; @@ -366,6 +367,7 @@ static struct resource mv64x60_eth1_resources[] = { }; static struct mv643xx_eth_platform_data eth1_pd = { + .shared = &mv64x60_eth_shared_device; .port_number = 1, }; @@ -391,6 +393,7 @@ static struct resource mv64x60_eth2_resources[] = { }; static struct mv643xx_eth_platform_data eth2_pd = { + .shared = &mv64x60_eth_shared_device; .port_number = 2, }; |