Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 305e831..d9b011e 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -175,6 +175,9 @@ config SYS_HYPERVISOR
 config SOC_BUS
        bool
 
+config GENERIC_CPU_VULNERABILITIES
+       bool
+
 source "drivers/base/regmap/Kconfig"
 
 config CMA