fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index f6ed663..567f681 100644 (file)
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -176,7 +176,7 @@ int request_irq(unsigned int irq,
        }               
 
        if (use_kmalloc)
-               irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+               irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
        else {
                /* use bootmem allocater */
                irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
@@ -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 {