[PATCH] irq-flags: H8300: 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: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
index edb3c4170013..1488b6ace18c 100644
--- a/arch/h8300/kernel/ints.c
+++ b/arch/h8300/kernel/ints.c
@@ -158,7 +158,7 @@ int request_irq(unsigned int irq,
         irq_handle->devname = devname;
         irq_list[irq] = irq_handle;
 
-        if (irq_handle->flags & SA_SAMPLE_RANDOM)
+        if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
                 rand_initialize_irq(irq);
 
         enable_irq(irq);
@@ -222,7 +222,7 @@ asmlinkage void process_int(int irq, struct pt_regs *fp)
                 if (irq_list[irq]) {
                         irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
                         irq_list[irq]->count++;
-                        if (irq_list[irq]->flags & SA_SAMPLE_RANDOM)
+                        if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM)
                                 add_interrupt_randomness(irq);
                 }
         } else {
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index f6ed663bdde0..270440de4610 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -192,7 +192,7 @@ int request_irq(unsigned int irq,
         irq_handle->dev_id  = dev_id;
         irq_handle->devname = devname;
         irq_list[irq] = irq_handle;
-        if (irq_handle->flags & SA_SAMPLE_RANDOM)
+        if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
                 rand_initialize_irq(irq);
         
         /* enable interrupt */
@@ -270,7 +270,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
                 if (irq_list[vec]) {
                         irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp);
                         irq_list[vec]->count++;
-                        if (irq_list[vec]->flags & SA_SAMPLE_RANDOM)
+                        if (irq_list[vec]->flags & IRQF_SAMPLE_RANDOM)
                                 add_interrupt_randomness(vec);
                 }
         } else {