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
/
mach-pxa
/
time.c
diff --git
a/arch/arm/mach-pxa/time.c
b/arch/arm/mach-pxa/time.c
index
b9b2057
..
5dbd191
100644
(file)
--- a/
arch/arm/mach-pxa/time.c
+++ b/
arch/arm/mach-pxa/time.c
@@
-10,7
+10,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
@@
-118,7
+117,7
@@
pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction pxa_timer_irq = {
.name = "PXA Timer Tick",
static struct irqaction pxa_timer_irq = {
.name = "PXA Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = pxa_timer_interrupt,
};
.handler = pxa_timer_interrupt,
};