diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-04 17:11:22 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-07-04 17:11:22 -0400 |
| commit | 2b0f89317e99735bbf32eaede81f707f98ab1b5e (patch) | |
| tree | 16daa236e21876b11f1c0b9256cd4046aadba020 /arch/x86/Kconfig | |
| parent | 07bd1172902e782f288e4d44b1fde7dec0f08b6f (diff) | |
| parent | fa18f7bde3ad4568d1d343b60d963bfbd8dc3991 (diff) | |
Merge branch 'timers/posix-cpu-timers-for-tglx' of
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core
Frederic sayed: "Most of these patches have been hanging around for
several month now, in -mmotm for a significant chunk. They already
missed a few releases."
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 685692c94f05..fe120da25625 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -2265,6 +2265,7 @@ source "fs/Kconfig.binfmt" | |||
| 2265 | config IA32_EMULATION | 2265 | config IA32_EMULATION |
| 2266 | bool "IA32 Emulation" | 2266 | bool "IA32 Emulation" |
| 2267 | depends on X86_64 | 2267 | depends on X86_64 |
| 2268 | select BINFMT_ELF | ||
| 2268 | select COMPAT_BINFMT_ELF | 2269 | select COMPAT_BINFMT_ELF |
| 2269 | select HAVE_UID16 | 2270 | select HAVE_UID16 |
| 2270 | ---help--- | 2271 | ---help--- |