projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth...
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
arch
/
arm
/
mach-orion5x
/
common.c
diff --git
a/arch/arm/mach-orion5x/common.c
b/arch/arm/mach-orion5x/common.c
index
968deb5
..
0ecff5a
100644
(file)
--- 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);
}