summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
commit23a376f98c5dcfc392d47e8d1872884ff44e585d (patch)
treedbe476151bbd6530369c40746f2ec2365f7b500a /arch/x86/Kconfig
parentdriver: tty: vt: remove cast for kmalloc return value (diff)
parentLinux 3.9-rc3 (diff)
downloadlinux-23a376f98c5dcfc392d47e8d1872884ff44e585d.tar.xz
linux-23a376f98c5dcfc392d47e8d1872884ff44e585d.zip
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a4f24f5b1218..70c0f3da0476 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -112,7 +112,7 @@ config X86
select GENERIC_STRNLEN_USER
select HAVE_CONTEXT_TRACKING if X86_64
select HAVE_IRQ_TIME_ACCOUNTING
- select HAVE_VIRT_TO_BUS
+ select VIRT_TO_BUS
select MODULES_USE_ELF_REL if X86_32
select MODULES_USE_ELF_RELA if X86_64
select CLONE_BACKWARDS if X86_32