diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-06 20:14:13 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:13 -0500 |
| commit | d5d2448d896fbb9a427ee12eb8e5f6309f2473f7 (patch) | |
| tree | 1cb3702e6e1ef4b234371b490edd758eb6ff2a53 /arch | |
| parent | 9ee4016888f1b226d7bb9a10ddb782868f658b31 (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/boot/compressed/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c index c6798c75c67d..1ce7017fd627 100644 --- a/arch/i386/boot/compressed/misc.c +++ b/arch/i386/boot/compressed/misc.c | |||
| @@ -196,7 +196,7 @@ static int vidport; | |||
| 196 | static int lines, cols; | 196 | static int lines, cols; |
| 197 | 197 | ||
| 198 | #ifdef CONFIG_X86_NUMAQ | 198 | #ifdef CONFIG_X86_NUMAQ |
| 199 | static void * xquad_portio = NULL; | 199 | void *xquad_portio; |
| 200 | #endif | 200 | #endif |
| 201 | 201 | ||
| 202 | #include "../../../../lib/inflate.c" | 202 | #include "../../../../lib/inflate.c" |