Merge commit 'v2.6.39-rc1' into perf/urgent

Merge reason: use the post-merge-window tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index 7d0c7eb59f09..d8d638e09f8f 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -56,10 +56,10 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
         for (i = 0; i < 32; i++) {
                 unsigned int irq = irq_start + i;
 
-                set_irq_chip(irq, &orion_irq_chip);
-                set_irq_chip_data(irq, maskaddr);
-                set_irq_handler(irq, handle_level_irq);
-                irq_desc[irq].status |= IRQ_LEVEL;
+                irq_set_chip_and_handler(irq, &orion_irq_chip,
+                                         handle_level_irq);
+                irq_set_chip_data(irq, maskaddr);
+                irq_set_status_flags(irq, IRQ_LEVEL);
                 set_irq_flags(irq, IRQF_VALID);
         }
 }