summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKevin Hilman2009-05-07 00:53:25 +0200
committerKevin Hilman2009-05-27 00:56:55 +0200
commita330bd4750bc84aebb28faddd525d0bcbdde262d (patch)
tree0e71ad6192f7146c09ac5051a637079240417c4d /arch/arm
parentMerge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-... (diff)
downloadkernel-qcow2-linux-a330bd4750bc84aebb28faddd525d0bcbdde262d.tar.gz
kernel-qcow2-linux-a330bd4750bc84aebb28faddd525d0bcbdde262d.tar.xz
kernel-qcow2-linux-a330bd4750bc84aebb28faddd525d0bcbdde262d.zip
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 <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/irq.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 998c5c45587e..08a3b99abe61 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)