From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 7 Dec 2006 01:14:13 +0000 (+0100)
Subject: [PATCH] x86-64: Fix numaq build error
X-Git-Tag: v2.6.20-rc1~145^2^2~8^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d5d2448d896fbb9a427ee12eb8e5f6309f2473f7;p=linux-2.6-omap-h63xx.git

[PATCH] x86-64: Fix numaq build error

  CC      arch/i386/boot/compressed/misc.o
arch/i386/boot/compressed/misc.c:120: error: static declaration of 'xquad_portio' follows non-static declaration
include/asm/io.h:275: error: previous declaration of 'xquad_portio' was here
make[2]: *** [arch/i386/boot/compressed/misc.o] Error 1

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
---

diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c
index c6798c75c67..1ce7017fd62 100644
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/i386/boot/compressed/misc.c
@@ -196,7 +196,7 @@ static int vidport;
 static int lines, cols;
 
 #ifdef CONFIG_X86_NUMAQ
-static void * xquad_portio = NULL;
+void *xquad_portio;
 #endif
 
 #include "../../../../lib/inflate.c"