summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2008-05-06 12:22:03 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-06 12:22:03 -0400
commit54c852a2d61bb15d9b979410c2260edfb23d448c (patch)
tree7a6ba9d1743b01090b85611cea9dd79ec2950487 /arch/arm
parent7ab267d4ecdad3032d6bb31619a2744fc2074b59 (diff)
parentce4e2e4558903ef92edf1ab4e09b0b338a09fd61 (diff)
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.c2
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);
}