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/powerpc | |
| parent | 7ab267d4ecdad3032d6bb31619a2744fc2074b59 (diff) | |
| parent | ce4e2e4558903ef92edf1ab4e09b0b338a09fd61 (diff) | |
| download | op-kernel-dev-54c852a2d61bb15d9b979410c2260edfb23d448c.zip op-kernel-dev-54c852a2d61bb15d9b979410c2260edfb23d448c.tar.gz | |
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/chrp/pegasos_eth.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c index 5bcc58d..130ff72 100644 --- a/arch/powerpc/platforms/chrp/pegasos_eth.c +++ b/arch/powerpc/platforms/chrp/pegasos_eth.c @@ -58,7 +58,9 @@ static struct resource mv643xx_eth0_resources[] = { static struct mv643xx_eth_platform_data eth0_pd = { + .shared = &mv643xx_eth_shared_device, .port_number = 0, + .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0, .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE, .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16, @@ -88,7 +90,9 @@ static struct resource mv643xx_eth1_resources[] = { }; static struct mv643xx_eth_platform_data eth1_pd = { + .shared = &mv643xx_eth_shared_device, .port_number = 1, + .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1, .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE, .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16, diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index 41af122..a132e0d 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c @@ -239,6 +239,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id, memset(&pdata, 0, sizeof(pdata)); + pdata.shared = shared_pdev; + prop = of_get_property(np, "reg", NULL); if (!prop) return -ENODEV; |
