projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
[powerpc.git]
/
arch
/
i386
/
boot
/
compressed
/
misc.c
diff --git
a/arch/i386/boot/compressed/misc.c
b/arch/i386/boot/compressed/misc.c
index
c6798c7
..
1ce7017
100644
(file)
--- 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"