git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-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 b227052296cff2be019ed69e8b5b4d2c0d2931e9..5b0c6af44ec69e2a36307dd60daf11717abd6ea4 100644
(file)
--- a/
arch/arm/mach-shark/irq.c
+++ b/
arch/arm/mach-shark/irq.c
@@
-10,7
+10,6
@@
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/fs.h>
-#include <linux/ptrace.h>
#include <linux/interrupt.h>
#include <asm/irq.h>
#include <linux/interrupt.h>
#include <asm/irq.h>
@@
-61,7
+60,7
@@
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 irqreturn_t bogus_int(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t bogus_int(int irq, void *dev_id)
{
printk("Got interrupt %i!\n",irq);
return IRQ_NONE;
{
printk("Got interrupt %i!\n",irq);
return IRQ_NONE;
@@
-82,7
+81,7
@@
void __init shark_init_irq(void)
for (irq = 0; irq < NR_IRQS; irq++) {
set_irq_chip(irq, &fb_chip);
for (irq = 0; irq < NR_IRQS; irq++) {
set_irq_chip(irq, &fb_chip);
- set_irq_handler(irq,
do_edge_IRQ
);
+ set_irq_handler(irq,
handle_edge_irq
);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}