diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 08:12:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 08:12:20 -0800 |
| commit | 562e74fefc36eb57286455c68a60f2776659a7e1 (patch) | |
| tree | 1eeaeb09bc06ca65aad5e0c8882caab2bdcf1e90 /arch/cris/arch-v32/kernel/fasttimer.c | |
| parent | 77d143de75812596a58d126606f42d1214e09dde (diff) | |
| parent | e269a869417cd4053b37da1b19186902d3cbf63b (diff) | |
Merge tag 'cris-for-3.14' of git://jni.nu/cris
Pull cris changes from Jesper Nilsson:
"Mostly removal of deprecated or old code, but also a long promised
update of the CRIS syscalls"
* tag 'cris-for-3.14' of git://jni.nu/cris:
Drop code for CRISv10 CPU simulator
Cleanup whitespace, remove old author tag
CRIS: Add missing syscalls
cris: sync_serial: remove interruptible_sleep_on
cris: remove deprecated IRQF_DISABLED
Diffstat (limited to 'arch/cris/arch-v32/kernel/fasttimer.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index f6644535b17..b130c2c5fdd 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c @@ -786,7 +786,7 @@ int fast_timer_init(void) proc_create("fasttimer", 0, NULL, &proc_fasttimer_fops); #endif /* PROC_FS */ if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt, - IRQF_SHARED | IRQF_DISABLED, + IRQF_SHARED, "fast timer int", &fast_timer_list)) printk(KERN_ERR "err: fasttimer irq\n"); fast_timer_is_init = 1; |