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
/
mips
/
gt64120
/
common
/
time.c
diff --git
a/arch/mips/gt64120/common/time.c
b/arch/mips/gt64120/common/time.c
index
2287b59
..
d837b26
100644
(file)
--- a/
arch/mips/gt64120/common/time.c
+++ b/
arch/mips/gt64120/common/time.c
@@
-8,7
+8,6
@@
*/
#include <linux/interrupt.h>
#include <linux/kernel.h>
*/
#include <linux/interrupt.h>
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <asm/ptrace.h>
#include <linux/sched.h>
#include <linux/kernel_stat.h>
#include <asm/ptrace.h>
@@
-78,7
+77,7
@@
void gt64120_time_init(void)
* the values to the correct interrupt line.
*/
timer.handler = gt64120_irq;
* the values to the correct interrupt line.
*/
timer.handler = gt64120_irq;
- timer.flags =
SA_SHIRQ | SA_INTERRUPT
;
+ timer.flags =
IRQF_SHARED | IRQF_DISABLED
;
timer.name = "timer";
timer.dev_id = NULL;
timer.next = NULL;
timer.name = "timer";
timer.dev_id = NULL;
timer.next = NULL;