diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:39:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:40:02 +0100 |
| commit | 40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f (patch) | |
| tree | 9343f6be910d5ccd6195a68ef9f4c251abc7418c /arch/x86/Kconfig | |
| parent | c46f52231e79af025e2c89e889d69ec20a4c024f (diff) | |
| parent | 3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2 (diff) | |
Merge branch 'x86/cleanups' into x86/mm
Merge recent cleanups to the x86 MM code to resolve a conflict.
Conflicts:
arch/x86/mm/fault.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7b6dd10b162a..865c1e7346fe 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -889,7 +889,7 @@ config HPET_TIMER config HPET_EMULATE_RTC def_bool y - depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y) + depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y) config APB_TIMER def_bool y if X86_INTEL_MID |