diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 23:41:17 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 23:41:17 +0100 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /arch/x86/Kconfig | |
| parent | Linux 2.6.38 (diff) | |
| parent | Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.xz linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d5ed94d30aad..b46b75bef496 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2138,6 +2138,11 @@ config SYSVIPC_COMPAT def_bool y depends on COMPAT && SYSVIPC +config KEYS_COMPAT + bool + depends on COMPAT && KEYS + default y + endmenu |