diff options
| author | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /arch/x86/Kconfig | |
| parent | x86: move declaring x2apic_extra_bits (diff) | |
| parent | fix fs/nfs/nfsroot.c compilation (diff) | |
| download | kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.gz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.xz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.zip | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 e32960c447a6..7d17421b2a2e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -21,6 +21,7 @@ config X86 select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE select HAVE_OPROFILE + select HAVE_IOREMAP_PROT select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_DYNAMIC_FTRACE |