diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-05-06 12:22:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-06 12:22:03 -0400 |
| commit | 54c852a2d61bb15d9b979410c2260edfb23d448c (patch) | |
| tree | 7a6ba9d1743b01090b85611cea9dd79ec2950487 /arch/arm | |
| parent | 7ab267d4ecdad3032d6bb31619a2744fc2074b59 (diff) | |
| parent | ce4e2e4558903ef92edf1ab4e09b0b338a09fd61 (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.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 = { | |||
| 223 | 223 | ||
| 224 | void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) | 224 | void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) |
| 225 | { | 225 | { |
| 226 | eth_data->shared = &orion5x_eth_shared; | ||
| 226 | orion5x_eth.dev.platform_data = eth_data; | 227 | orion5x_eth.dev.platform_data = eth_data; |
| 228 | |||
| 227 | platform_device_register(&orion5x_eth_shared); | 229 | platform_device_register(&orion5x_eth_shared); |
| 228 | platform_device_register(&orion5x_eth); | 230 | platform_device_register(&orion5x_eth); |
| 229 | } | 231 | } |