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/arm | |
| 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/arm')
| -rw-r--r-- | arch/arm/mach-orion5x/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 968deb58be01..0ecff5a61972 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -223,7 +223,9 @@ static struct platform_device orion5x_eth = { void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) { + eth_data->shared = &orion5x_eth_shared; orion5x_eth.dev.platform_data = eth_data; + platform_device_register(&orion5x_eth_shared); platform_device_register(&orion5x_eth); } |