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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
common
/
time-acorn.c
diff --git
a/arch/arm/common/time-acorn.c
b/arch/arm/common/time-acorn.c
index
486add8
..
3f60dd9
100644
(file)
--- a/
arch/arm/common/time-acorn.c
+++ b/
arch/arm/common/time-acorn.c
@@
-16,6
+16,7
@@
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/io.h>
@@
-76,7
+77,7
@@
ioc_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ioc_timer_irq = {
.name = "timer",
static struct irqaction ioc_timer_irq = {
.name = "timer",
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.handler = ioc_timer_interrupt
};
.handler = ioc_timer_interrupt
};