Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / h8300 / platform / h8s / ints.c

diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 567f681..ac10b97 100644 (file)
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -20,6 +20,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/bootmem.h>
 #include <linux/random.h>
 #include <linux/hardirq.h>
@@ -120,7 +121,7 @@ void __init init_IRQ(void)
                printk("virtual vector at 0x%08lx\n",(unsigned long)ramvec);
 
 #if defined(CONFIG_GDB_DEBUG)
-       /* save orignal break vector */
+       /* save original break vector */
        break_vec = ramvec[TRAP3_VEC];
 #else
        break_vec = VECTOR(trace_break);
@@ -178,7 +179,7 @@ int request_irq(unsigned int irq,
        if (use_kmalloc)
                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
        else {
-               /* use bootmem allocater */
+               /* use bootmem allocator */
                irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
                irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000);
        }