diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /arch/arm/common/vic.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'arch/arm/common/vic.c')
| -rw-r--r-- | arch/arm/common/vic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index ae5fe7292e0d..113085a77123 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c | |||
| @@ -305,9 +305,9 @@ static void __init vic_set_irq_sources(void __iomem *base, | |||
| 305 | if (vic_sources & (1 << i)) { | 305 | if (vic_sources & (1 << i)) { |
| 306 | unsigned int irq = irq_start + i; | 306 | unsigned int irq = irq_start + i; |
| 307 | 307 | ||
| 308 | set_irq_chip(irq, &vic_chip); | 308 | irq_set_chip_and_handler(irq, &vic_chip, |
| 309 | set_irq_chip_data(irq, base); | 309 | handle_level_irq); |
| 310 | set_irq_handler(irq, handle_level_irq); | 310 | irq_set_chip_data(irq, base); |
| 311 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 311 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 312 | } | 312 | } |
| 313 | } | 313 | } |