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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
fasttimer.c
diff --git
a/arch/cris/arch-v32/kernel/fasttimer.c
b/arch/cris/arch-v32/kernel/fasttimer.c
index
ea2b4a9
..
5daeb6f
100644
(file)
--- a/
arch/cris/arch-v32/kernel/fasttimer.c
+++ b/
arch/cris/arch-v32/kernel/fasttimer.c
@@
-120,7
+120,6
@@
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/system.h>
-#include <linux/config.h>
#include <linux/version.h>
#include <asm/arch/hwregs/reg_map.h>
#include <linux/version.h>
#include <asm/arch/hwregs/reg_map.h>
@@
-982,7
+981,7
@@
void fast_timer_init(void)
proc_register_dynamic(&proc_root, &fasttimer_proc_entry);
#endif
#endif /* PROC_FS */
proc_register_dynamic(&proc_root, &fasttimer_proc_entry);
#endif
#endif /* PROC_FS */
- if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt,
SA_INTERRUPT
,
+ if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt,
IRQF_DISABLED
,
"fast timer int", NULL))
{
printk("err: timer1 irq\n");
"fast timer int", NULL))
{
printk("err: timer1 irq\n");