diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-06 18:53:25 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-26 18:56:55 -0400 |
commit | a330bd4750bc84aebb28faddd525d0bcbdde262d (patch) | |
tree | 0e71ad6192f7146c09ac5051a637079240417c4d /arch/arm/mach-omap2/irq.c | |
parent | 88b6f7eb9b4a06fbfe27f2d98e249577f4cfdaef (diff) |
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/mach-omap2/irq.c')
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 1 |
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 = { | |||
134 | .ack = omap_mask_ack_irq, | 134 | .ack = omap_mask_ack_irq, |
135 | .mask = omap_mask_irq, | 135 | .mask = omap_mask_irq, |
136 | .unmask = omap_unmask_irq, | 136 | .unmask = omap_unmask_irq, |
137 | .disable = omap_mask_irq, | ||
138 | }; | 137 | }; |
139 | 138 | ||
140 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | 139 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) |