diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/mips/sni | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/mips/sni')
| -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) | |||
| 67 | 67 | ||
| 68 | static struct irqaction a20r_irqaction = { | 68 | static struct irqaction a20r_irqaction = { |
| 69 | .handler = a20r_interrupt, | 69 | .handler = a20r_interrupt, |
| 70 | .flags = IRQF_DISABLED | IRQF_PERCPU, | 70 | .flags = IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER, |
| 71 | .name = "a20r-timer", | 71 | .name = "a20r-timer", |
| 72 | }; | 72 | }; |
| 73 | 73 | ||