Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux

[karo-tx-linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 43abf3c6da8e4c72d5e2414cde2d43200a57b40e..8d24bacaa61ea5746e326133d32f019f9511b602 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -30,9 +30,6 @@ config OPROFILE_EVENT_MULTIPLEX
 config HAVE_OPROFILE
        bool
 
-config HAVE_HWSAMPLER
-       bool
-
 config KPROBES
        bool "Kprobes"
        depends on MODULES
@@ -147,9 +144,6 @@ config HAVE_CLK
 config HAVE_DMA_API_DEBUG
        bool
 
-config HAVE_DEFAULT_NO_SPIN_MUTEXES
-       bool
-
 config HAVE_HW_BREAKPOINT
        bool
        depends on PERF_EVENTS