diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
| commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
| tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /arch/s390/Kconfig | |
| parent | 098b0e01a91c42aaaf0425605cd126b03fcb0bcf (diff) | |
| parent | 8e6cec1c7c5afa489687c90be15d6ed82c742975 (diff) | |
| download | linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz | |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index e161fafb495b..6967addc6a89 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -363,9 +363,6 @@ config COMPAT config SYSVIPC_COMPAT def_bool y if COMPAT && SYSVIPC -config KEYS_COMPAT - def_bool y if COMPAT && KEYS - config SMP def_bool y prompt "Symmetric multi-processing support" |