git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
h8300
/
kernel
/
ints.c
diff --git
a/arch/h8300/kernel/ints.c
b/arch/h8300/kernel/ints.c
index
1bfc77e
..
3e4f479
100644
(file)
--- a/
arch/h8300/kernel/ints.c
+++ b/
arch/h8300/kernel/ints.c
@@
-19,6
+19,7
@@
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
+#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/random.h>
#include <linux/bootmem.h>
#include <linux/init.h>
#include <linux/random.h>
#include <linux/bootmem.h>
@@
-141,7
+142,7
@@
int request_irq(unsigned int irq,
return -EBUSY;
if (use_kmalloc)
return -EBUSY;
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));
else {
/* use bootmem allocater */
irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));