diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
| commit | 0a759b2466d19c619257fec36f988f93424cf3ae (patch) | |
| tree | 910e531540bda17c484b53b89fb2f1d6dd41a454 /arch/m68k/platform/coldfire/timers.c | |
| parent | Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | m68k: Remove deprecated IRQF_DISABLED (diff) | |
| download | linux-dev-0a759b2466d19c619257fec36f988f93424cf3ae.tar.xz linux-dev-0a759b2466d19c619257fec36f988f93424cf3ae.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- __put_user_unaligned may/will be used by btrfs
- m68k part of a global cleanup"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove deprecated IRQF_DISABLED
m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
Diffstat (limited to 'arch/m68k/platform/coldfire/timers.c')
| -rw-r--r-- | arch/m68k/platform/coldfire/timers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c index d06068e45764..cd496a20fcc7 100644 --- a/arch/m68k/platform/coldfire/timers.c +++ b/arch/m68k/platform/coldfire/timers.c @@ -83,7 +83,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy) static struct irqaction mcftmr_timer_irq = { .name = "timer", - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = mcftmr_tick, }; @@ -171,7 +171,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy) static struct irqaction coldfire_profile_irq = { .name = "profile timer", - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = coldfire_profile_tick, }; |