summaryrefslogtreecommitdiff
path: root/arch/ppc
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/ppc
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/ppc')
-rw-r--r--arch/ppc/syslib/mv64x60.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 90fe904d3614..418f3053de52 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -341,6 +341,7 @@ static struct resource mv64x60_eth0_resources[] = {
};
static struct mv643xx_eth_platform_data eth0_pd = {
+ .shared = &mv64x60_eth_shared_device;
.port_number = 0,
};
@@ -366,6 +367,7 @@ static struct resource mv64x60_eth1_resources[] = {
};
static struct mv643xx_eth_platform_data eth1_pd = {
+ .shared = &mv64x60_eth_shared_device;
.port_number = 1,
};
@@ -391,6 +393,7 @@ static struct resource mv64x60_eth2_resources[] = {
};
static struct mv643xx_eth_platform_data eth2_pd = {
+ .shared = &mv64x60_eth_shared_device;
.port_number = 2,
};