From a330bd4750bc84aebb28faddd525d0bcbdde262d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 6 May 2009 15:53:25 -0700 Subject: Revert "ARM: OMAP: Mask interrupts when disabling interrupts, v2" This reverts commit 5461af5af5c6a7fee78978aafe720541bf3a2f55. Adding a disable hook to the irq_chip is not the way to fix the problem being addressed by this patch. Instead, we need to fix support for [enable|disable]_irq_wake(). Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/irq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 998c5c45587..08a3b99abe6 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -134,7 +134,6 @@ static struct irq_chip omap_irq_chip = { .ack = omap_mask_ack_irq, .mask = omap_mask_irq, .unmask = omap_unmask_irq, - .disable = omap_mask_irq, }; static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) -- cgit v1.2.3