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
Pull button into test branch
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
irq.c
diff --git
a/arch/sparc/kernel/irq.c
b/arch/sparc/kernel/irq.c
index
b3b6680
..
5b4841d
100644
(file)
--- a/
arch/sparc/kernel/irq.c
+++ b/
arch/sparc/kernel/irq.c
@@
-351,7
+351,7
@@
void handler_irq(int irq, struct pt_regs * regs)
}
#ifdef CONFIG_BLK_DEV_FD
}
#ifdef CONFIG_BLK_DEV_FD
-extern void floppy_interrupt(int irq, void *dev_id)
+extern void floppy_interrupt(int irq, void *dev_id)
;
void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
{
void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
{
@@
-425,7
+425,7
@@
int request_fast_irq(unsigned int irq,
}
if (action == NULL)
}
if (action == NULL)
- action =
(struct irqaction *)
kmalloc(sizeof(struct irqaction),
+ action = kmalloc(sizeof(struct irqaction),
GFP_ATOMIC);
if (!action) {
GFP_ATOMIC);
if (!action) {
@@
-528,7
+528,7
@@
int request_irq(unsigned int irq,
}
if (action == NULL)
}
if (action == NULL)
- action =
(struct irqaction *)
kmalloc(sizeof(struct irqaction),
+ action = kmalloc(sizeof(struct irqaction),
GFP_ATOMIC);
if (!action) {
GFP_ATOMIC);
if (!action) {