diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /arch/x86 | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/x86')
| -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 | |||
| 2138 | def_bool y | 2138 | def_bool y |
| 2139 | depends on COMPAT && SYSVIPC | 2139 | depends on COMPAT && SYSVIPC |
| 2140 | 2140 | ||
| 2141 | config KEYS_COMPAT | ||
| 2142 | bool | ||
| 2143 | depends on COMPAT && KEYS | ||
| 2144 | default y | ||
| 2145 | |||
| 2141 | endmenu | 2146 | endmenu |
| 2142 | 2147 | ||
| 2143 | 2148 | ||