diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
| commit | 33f9936b2b73dba6c8685994c441c4fd30b04814 (patch) | |
| tree | 9ce8105bc1e44ba66276695927b15df0d3fc185d /arch/arm/mach-orion5x/common.c | |
| parent | aca51397d01474f80cab8fc978559b45f2e453ad (diff) | |
| parent | f227ec3ca2b7be449fb2156e82b40cceed87a34a (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
| -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 968deb58be0..0ecff5a6197 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); } |