aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 22:29:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 16:58:47 -0400
commitb0b9fdc123cf0f1b671ac3f593d77af325ad4cf3 (patch)
treee4884524c5c85bbc2de481d4efecf3ca4b8bc349 /arch/m68k/kernel
parentf6f238875c93d020efb4d51cbca464dff31ec1f9 (diff)
[PATCH] irq-flags: M68K: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/ints.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index e969f0477640..b33e37fb7b0e 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -192,7 +192,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
192 prev = irq_list + irq; 192 prev = irq_list + irq;
193 if (*prev) { 193 if (*prev) {
194 /* Can't share interrupts unless both agree to */ 194 /* Can't share interrupts unless both agree to */
195 if (!((*prev)->flags & node->flags & SA_SHIRQ)) { 195 if (!((*prev)->flags & node->flags & IRQF_SHARED)) {
196 spin_unlock_irqrestore(&contr->lock, flags); 196 spin_unlock_irqrestore(&contr->lock, flags);
197 return -EBUSY; 197 return -EBUSY;
198 } 198 }