summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-05 16:27:00 -0700
committerOlof Johansson <olof@lixom.net>2012-09-05 16:27:00 -0700
commit402efdb48d6a6aef9e91e3112a94b679d787fef7 (patch)
tree69ed39eb1c02fd40e4a2f807f4057e18de6ac13c /arch/arm/mach-dove/common.c
parent1875962377574b4edb7b164001e3e341c25290d5 (diff)
parent056876f6c73406c06d530d16d020177f5ec4a0bd (diff)
downloadlinux-402efdb48d6a6aef9e91e3112a94b679d787fef7.tar.bz2
Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt
This branch enables device tree bindings for the CSR Prima pin control subsystem. All patches acked by Linus W (pinctrl maintainer). * 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel: pinctrl: sirf: add DT-binding pinmux mapping support ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features ARM: PRIMA2: add missing interrupts property for pinctrl node + sync to Linux 3.6-rc4
Diffstat (limited to 'arch/arm/mach-dove/common.c')
-rw-r--r--arch/arm/mach-dove/common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index db399dfbe905..e5a97d97e38d 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -102,7 +102,8 @@ void __init dove_ehci1_init(void)
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
{
orion_ge00_init(eth_data, DOVE_GE00_PHYS_BASE,
- IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR);
+ IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR,
+ 1600);
}
/*****************************************************************************