diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-13 01:34:11 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-13 01:34:11 -0400 |
commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/arm/mach-mv78xx0/common.c | |
parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (diff) | |
parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb (diff) |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'arch/arm/mach-mv78xx0/common.c')
-rw-r--r-- | arch/arm/mach-mv78xx0/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 20826449e61b..6b0c38735527 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
@@ -208,7 +208,8 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) | |||
208 | { | 208 | { |
209 | orion_ge00_init(eth_data, | 209 | orion_ge00_init(eth_data, |
210 | GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM, | 210 | GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM, |
211 | IRQ_MV78XX0_GE_ERR); | 211 | IRQ_MV78XX0_GE_ERR, |
212 | MV643XX_TX_CSUM_DEFAULT_LIMIT); | ||
212 | } | 213 | } |
213 | 214 | ||
214 | 215 | ||
@@ -219,7 +220,8 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) | |||
219 | { | 220 | { |
220 | orion_ge01_init(eth_data, | 221 | orion_ge01_init(eth_data, |
221 | GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM, | 222 | GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM, |
222 | NO_IRQ); | 223 | NO_IRQ, |
224 | MV643XX_TX_CSUM_DEFAULT_LIMIT); | ||
223 | } | 225 | } |
224 | 226 | ||
225 | 227 | ||