Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 43abf3c6da8e4c72d5e2414cde2d43200a57b40e..f78c2be4242b437ced3308795952102bf1359763 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