diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:18:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 12:06:53 -0400 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/setup.h | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/setup.h')
| -rw-r--r-- | include/asm-x86/setup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h index b7aeba94e430..9030cb73c4d7 100644 --- a/include/asm-x86/setup.h +++ b/include/asm-x86/setup.h | |||
| @@ -41,6 +41,7 @@ struct x86_quirks { | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | extern struct x86_quirks *x86_quirks; | 43 | extern struct x86_quirks *x86_quirks; |
| 44 | extern unsigned long saved_video_mode; | ||
| 44 | 45 | ||
| 45 | #ifndef CONFIG_PARAVIRT | 46 | #ifndef CONFIG_PARAVIRT |
| 46 | #define paravirt_post_allocator_init() do {} while (0) | 47 | #define paravirt_post_allocator_init() do {} while (0) |