From 6583f43ef5dd440be056b58508531ca58d639c4f Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Sun, 18 May 2008 19:46:59 +0200 Subject: [PATCH] --- yaml --- r: 100730 b: refs/heads/master c: 000e99c3334cdddaec020d7324fe4ca2a683d3dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-orion/irq.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cecfdc8572d0..d339c46a6571 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee0dd840052e303a3eb171363be5e6364d200a51 +refs/heads/master: 000e99c3334cdddaec020d7324fe4ca2a683d3dd diff --git a/trunk/arch/arm/plat-orion/irq.c b/trunk/arch/arm/plat-orion/irq.c index c5b669d234bc..fe66a1835169 100644 --- a/trunk/arch/arm/plat-orion/irq.c +++ b/trunk/arch/arm/plat-orion/irq.c @@ -36,8 +36,8 @@ static void orion_irq_unmask(u32 irq) static struct irq_chip orion_irq_chip = { .name = "orion_irq", - .ack = orion_irq_mask, .mask = orion_irq_mask, + .mask_ack = orion_irq_mask, .unmask = orion_irq_unmask, }; @@ -59,6 +59,7 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) 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; set_irq_flags(irq, IRQF_VALID); } }