diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 18:16:44 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 18:16:44 +0200 |
| commit | f53f292eeaa234615c31a1306babe703fc4263f2 (patch) | |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 /arch/ia64/hp/sim/Kconfig | |
| parent | x86, efi: Make efi_memblock_x86_reserve_range more readable (diff) | |
| parent | efi: split efisubsystem from efivars (diff) | |
| download | linux-f53f292eeaa234615c31a1306babe703fc4263f2.tar.xz linux-f53f292eeaa234615c31a1306babe703fc4263f2.zip | |
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/ia64/hp/sim/Kconfig')
| -rw-r--r-- | arch/ia64/hp/sim/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig index 8d513a8c5266..d84707d55203 100644 --- a/arch/ia64/hp/sim/Kconfig +++ b/arch/ia64/hp/sim/Kconfig @@ -8,6 +8,7 @@ config HP_SIMETH config HP_SIMSERIAL bool "Simulated serial driver support" + depends on TTY config HP_SIMSERIAL_CONSOLE bool "Console for HP simulator" |