diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 14:33:02 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 18:18:29 +0200 |
commit | 0a224c514f3e9620e167f9f6497ae526a41df22c (patch) | |
tree | 54193db2b3c577cb6b086481da689ac8cc8322c5 /arch/arm/mach-orion5x/common.c | |
parent | c6041d4adde006216cd7e8da4558323ddb2e4255 (diff) | |
parent | b74ffd85e32d44e8ed405a2a0a175ef4cd39cf67 (diff) |
Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper <jason@lakedaemon.net>:
Small fixes for the orion platforms including kirkwood.
* 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: fix Makefile.boot
ARM: Kirkwood: Fix iconnect leds
ARM: Orion: Set eth packet size csum offload limit
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 9148b229d0de..410291c67666 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -109,7 +109,8 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) { orion_ge00_init(eth_data, ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM, - IRQ_ORION5X_ETH_ERR); + IRQ_ORION5X_ETH_ERR, + MV643XX_TX_CSUM_DEFAULT_LIMIT); } |