diff options
-rw-r--r-- | arch/x86/boot/compressed/early_serial_console.c | 4 | ||||
-rw-r--r-- | arch/x86/boot/compressed/misc.h | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/early_serial_console.c b/arch/x86/boot/compressed/early_serial_console.c index 261e81fb9582..d3d003cb5481 100644 --- a/arch/x86/boot/compressed/early_serial_console.c +++ b/arch/x86/boot/compressed/early_serial_console.c | |||
@@ -1,5 +1,9 @@ | |||
1 | #include "misc.h" | 1 | #include "misc.h" |
2 | 2 | ||
3 | #ifdef CONFIG_EARLY_PRINTK | ||
4 | |||
3 | int early_serial_base; | 5 | int early_serial_base; |
4 | 6 | ||
5 | #include "../early_serial_console.c" | 7 | #include "../early_serial_console.c" |
8 | |||
9 | #endif | ||
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 618e5c830f15..3ffee6e0c54c 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h | |||
@@ -43,7 +43,17 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize); | |||
43 | int cmdline_find_option_bool(const char *option); | 43 | int cmdline_find_option_bool(const char *option); |
44 | 44 | ||
45 | /* early_serial_console.c */ | 45 | /* early_serial_console.c */ |
46 | #ifdef CONFIG_EARLY_PRINTK | ||
47 | |||
46 | extern int early_serial_base; | 48 | extern int early_serial_base; |
47 | void console_init(void); | 49 | void console_init(void); |
48 | 50 | ||
51 | #else | ||
52 | |||
53 | static const int early_serial_base; | ||
54 | static inline void console_init(void) | ||
55 | { } | ||
56 | |||
57 | #endif | ||
58 | |||
49 | #endif | 59 | #endif |