diff options
| author |   Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
| commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
| tree | 3fb6b00359a63d8d2e33005599046c105956d314 /arch/arm/plat-orion/common.c | |
| parent | ARM: OMAP: Config fix for omap3-touchbook board (diff) | |
| parent | ARM: OMAP4: Fix array size for irq_target_cpu (diff) | |
| download | linux-dev-580a7ce8fb5012c0c0afe592bdafd482a3679911.tar.xz linux-dev-580a7ce8fb5012c0c0afe592bdafd482a3679911.zip | |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'arch/arm/plat-orion/common.c')
| -rw-r--r-- | arch/arm/plat-orion/common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index d245a87dc014..b8b747a9d360 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -291,10 +291,12 @@ static struct platform_device orion_ge00 = { void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data, unsigned long mapbase, unsigned long irq, - unsigned long irq_err) + unsigned long irq_err, + unsigned int tx_csum_limit) { fill_resources(&orion_ge00_shared, orion_ge00_shared_resources, mapbase + 0x2000, SZ_16K - 1, irq_err); + orion_ge00_shared_data.tx_csum_limit = tx_csum_limit; ge_complete(&orion_ge00_shared_data, orion_ge00_resources, irq, &orion_ge00_shared, eth_data, &orion_ge00); @@ -343,10 +345,12 @@ static struct platform_device orion_ge01 = { void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data, unsigned long mapbase, unsigned long irq, - unsigned long irq_err) + unsigned long irq_err, + unsigned int tx_csum_limit) { fill_resources(&orion_ge01_shared, orion_ge01_shared_resources, mapbase + 0x2000, SZ_16K - 1, irq_err); + orion_ge01_shared_data.tx_csum_limit = tx_csum_limit; ge_complete(&orion_ge01_shared_data, orion_ge01_resources, irq, &orion_ge01_shared, eth_data, &orion_ge01); |