git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm
/
mach-shark
/
irq.c
diff --git
a/arch/arm/mach-shark/irq.c
b/arch/arm/mach-shark/irq.c
index
fb8e6b3
..
6cb67bd
100644
(file)
--- a/
arch/arm/mach-shark/irq.c
+++ b/
arch/arm/mach-shark/irq.c
@@
-61,9
+61,10
@@
static void shark_enable_8259A_irq(unsigned int irq)
static void shark_ack_8259A_irq(unsigned int irq){}
static void shark_ack_8259A_irq(unsigned int irq){}
-static
void
bogus_int(int irq, void *dev_id, struct pt_regs *regs)
+static
irqreturn_t
bogus_int(int irq, void *dev_id, struct pt_regs *regs)
{
printk("Got interrupt %i!\n",irq);
{
printk("Got interrupt %i!\n",irq);
+ return IRQ_NONE;
}
static struct irqaction cascade;
}
static struct irqaction cascade;
@@
-102,11
+103,7
@@
void __init shark_init_irq(void)
//request_region(0xA0,0x2,"pic2");
cascade.handler = bogus_int;
//request_region(0xA0,0x2,"pic2");
cascade.handler = bogus_int;
- cascade.flags = 0;
- cascade.mask = 0;
cascade.name = "cascade";
cascade.name = "cascade";
- cascade.next = NULL;
- cascade.dev_id = NULL;
setup_irq(2,&cascade);
}
setup_irq(2,&cascade);
}