Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / arch / h8300 / kernel / ints.c

diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
index 7246e29..1488b6a 100644 (file)
--- a/arch/h8300/kernel/ints.c
+++ b/arch/h8300/kernel/ints.c
@@ -22,13 +22,13 @@
 #include <linux/init.h>
 #include <linux/random.h>
 #include <linux/bootmem.h>
+#include <linux/hardirq.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/io.h>
 #include <asm/setup.h>
-#include <asm/hardirq.h>
 #include <asm/errno.h>
 
 /*
@@ -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 {