diff options
| author | Russell King | 2009-12-04 15:59:47 +0100 |
|---|---|---|
| committer | Russell King | 2009-12-04 15:59:47 +0100 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/mips/sni/time.c | |
| parent | ARM: 5846/1: MAINTAINERS: Add arm Nomadik support (diff) | |
| parent | ARM: I-cache: flush executable mappings in flush_cache_range() (diff) | |
| download | kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.gz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.zip | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/mips/sni/time.c')
| -rw-r--r-- | arch/mips/sni/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c index 62df6a598e0a..f3b60e671207 100644 --- a/arch/mips/sni/time.c +++ b/arch/mips/sni/time.c @@ -67,7 +67,7 @@ static irqreturn_t a20r_interrupt(int irq, void *dev_id) static struct irqaction a20r_irqaction = { .handler = a20r_interrupt, - .flags = IRQF_DISABLED | IRQF_PERCPU, + .flags = IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER, .name = "a20r-timer", }; |