diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-20 14:22:54 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-20 14:22:54 -0500 |
| commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch) | |
| tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /arch/x86 | |
| parent | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (diff) | |
| parent | e26f1db9b8d74617519e50b41749900d0a257406 (diff) | |
| download | linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.tar.gz linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.tar.bz2 linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.zip | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next
Conflicts:
arch/arm64/kernel/early_printk.c
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 25d2c6f7325e..0fb6cfd50e75 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -261,6 +261,9 @@ config ARCH_HWEIGHT_CFLAGS config ARCH_SUPPORTS_UPROBES def_bool y +config FIX_EARLYCON_MEM + def_bool y + source "init/Kconfig" source "kernel/Kconfig.freezer" |