diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:36:05 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:44:30 -0500 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /arch/m32r/kernel/irq.c | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 (diff) | |
| parent | 452858338aec31c1f4414bf07f31663690479869 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'arch/m32r/kernel/irq.c')
| -rw-r--r-- | arch/m32r/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index f745c1287f3a..76eaf3883fbd 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c | |||
| @@ -80,7 +80,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs) | |||
| 80 | #ifdef CONFIG_DEBUG_STACKOVERFLOW | 80 | #ifdef CONFIG_DEBUG_STACKOVERFLOW |
| 81 | /* FIXME M32R */ | 81 | /* FIXME M32R */ |
| 82 | #endif | 82 | #endif |
| 83 | __do_IRQ(irq); | 83 | generic_handle_irq(irq); |
| 84 | irq_exit(); | 84 | irq_exit(); |
| 85 | set_irq_regs(old_regs); | 85 | set_irq_regs(old_regs); |
| 86 | 86 | ||