diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 23:40:55 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 23:41:06 +0200 |
commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/mach-versatile | |
parent | Merge branch 'ep93xx' into devel (diff) | |
parent | [ARM] S3C24XX: Merge devel-gpio (diff) | |
download | linux-547c32aeb5a24178ef20488ae0508efcc32ae8e4.tar.xz linux-547c32aeb5a24178ef20488ae0508efcc32ae8e4.zip |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index b3bebcc5623b..69214fc8bd19 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -116,7 +116,7 @@ void __init versatile_init_irq(void) { unsigned int i; - vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0); + vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0); set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq); |