linux-omap 2.6.37: replace various patch with upstream versions and rediff
[openembedded.git] / recipes / linux / linux-omap-2.6.37 / linus / 0062-arch-mn10300-kernel-irq.c-fix-build.patch
blobecbbaa0240f0ced03bc8dd98a9292a8f2e743e2c
1 From 942dd5c14797f41c9e6d960ae95940ccdb7cb044 Mon Sep 17 00:00:00 2001
2 From: Andrew Morton <akpm@linux-foundation.org>
3 Date: Mon, 3 Jan 2011 14:59:11 -0800
4 Subject: [PATCH 62/65] arch/mn10300/kernel/irq.c: fix build
6 Addresses https://bugzilla.kernel.org/show_bug.cgi?id=25702
8 Reported-by: Martin Ettl <ettl.martin@gmx.de>
9 Cc: David Howells <dhowells@redhat.com>
10 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
12 ---
13 arch/mn10300/kernel/irq.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
16 diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
17 index c2e4459..ac11754 100644
18 --- a/arch/mn10300/kernel/irq.c
19 +++ b/arch/mn10300/kernel/irq.c
20 @@ -459,7 +459,7 @@ void migrate_irqs(void)
21 tmp = CROSS_GxICR(irq, new);
23 x &= GxICR_LEVEL | GxICR_ENABLE;
24 - if (GxICR(irq) & GxICR_REQUEST) {
25 + if (GxICR(irq) & GxICR_REQUEST)
26 x |= GxICR_REQUEST | GxICR_DETECT;
27 CROSS_GxICR(irq, new) = x;
28 tmp = CROSS_GxICR(irq, new);
29 --
30 1.6.6.1