Merge branch 'linus' into x86/urgent, to pick up dependent changes

[linux-2.6-block.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 818b361094ed6fe67ea049bbe9831e165804ffac..6bc9dd6e7534c16775266724c20a9ba551770233 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -259,9 +259,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
        bool
 
-config GENERIC_HWEIGHT
-       def_bool y
-
 config ARCH_MAY_HAVE_PC_FDC
        def_bool y
        depends on ISA_DMA_API
@@ -305,9 +302,6 @@ config ZONE_DMA32
 config AUDIT_ARCH
        def_bool y if X86_64
 
-config ARCH_SUPPORTS_OPTIMIZED_INLINING
-       def_bool y
-
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y