Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / arch / um / Kconfig.common

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 347bcd444c990dd9b0244205f45d04564bd69a51..85f6dd204ab616a7fdd6bc080310bfc4967c1ef5 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -50,11 +50,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_BUG
-       bool
-       default y
-       depends on BUG
-
 config HZ
        int
        default 100