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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-footbridge
/
isa-timer.c
diff --git
a/arch/arm/mach-footbridge/isa-timer.c
b/arch/arm/mach-footbridge/isa-timer.c
index
c4810a4
..
c1d74f7
100644
(file)
--- a/
arch/arm/mach-footbridge/isa-timer.c
+++ b/
arch/arm/mach-footbridge/isa-timer.c
@@
-6,7
+6,6
@@
*/
#include <linux/init.h>
#include <linux/interrupt.h>
*/
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
@@
-73,7
+72,7
@@
isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction isa_timer_irq = {
.name = "ISA timer tick",
.handler = isa_timer_interrupt,
static struct irqaction isa_timer_irq = {
.name = "ISA timer tick",
.handler = isa_timer_interrupt,
- .flags =
IRQF_DISABLED | IRQF
_TIMER,
+ .flags =
SA_INTERRUPT | SA
_TIMER,
};
static void __init isa_timer_init(void)
};
static void __init isa_timer_init(void)