diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /arch/x86/boot/compressed | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 11629e903aa5..bc5553b496f7 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c | |||
| @@ -218,10 +218,6 @@ static char *vidmem; | |||
| 218 | static int vidport; | 218 | static int vidport; |
| 219 | static int lines, cols; | 219 | static int lines, cols; |
| 220 | 220 | ||
| 221 | #ifdef CONFIG_X86_NUMAQ | ||
| 222 | void *xquad_portio; | ||
| 223 | #endif | ||
| 224 | |||
| 225 | #include "../../../../lib/inflate.c" | 221 | #include "../../../../lib/inflate.c" |
| 226 | 222 | ||
| 227 | static void *malloc(int size) | 223 | static void *malloc(int size) |