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 /include | |
parent | c6041d4adde006216cd7e8da4558323ddb2e4255 (diff) | |
parent | b74ffd85e32d44e8ed405a2a0a175ef4cd39cf67 (diff) | |
download | linux-3.10-0a224c514f3e9620e167f9f6497ae526a41df22c.tar.gz linux-3.10-0a224c514f3e9620e167f9f6497ae526a41df22c.tar.bz2 linux-3.10-0a224c514f3e9620e167f9f6497ae526a41df22c.zip |
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 'include')
-rw-r--r-- | include/linux/mv643xx_eth.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 51bf8ada6dc..49258e0ed1c 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -15,6 +15,8 @@ #define MV643XX_ETH_SIZE_REG_4 0x2224 #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 +#define MV643XX_TX_CSUM_DEFAULT_LIMIT 0 + struct mv643xx_eth_shared_platform_data { struct mbus_dram_target_info *dram; struct platform_device *shared_smi; |