diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 17:40:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 17:41:06 -0400 |
| commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
| tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/mach-versatile | |
| parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
| parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) | |
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) | |||
| 116 | { | 116 | { |
| 117 | unsigned int i; | 117 | unsigned int i; |
| 118 | 118 | ||
| 119 | vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0); | 119 | vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0); |
| 120 | 120 | ||
| 121 | set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq); | 121 | set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq); |
| 122 | 122 | ||