diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:27:37 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:28:05 -0500 |
| commit | b7e56edba4b02f2079042c326a8cd72a44635817 (patch) | |
| tree | b5042002e9747cd8fb1278d61f86d8b92a74c018 /arch/mips/sni/time.c | |
| parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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) | |||
| 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 | ||