diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 48398b4..0e37f7d 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -198,30 +198,6 @@ config DEV_COREDUMP
 	default y if WANT_DEV_COREDUMP
 	depends on ALLOW_DEV_COREDUMP
 
-config WANT_DEV_COREDUMP
-	bool
-	help
-	  Drivers should "select" this option if they desire to use the
-	  device coredump mechanism.
-
-config ALLOW_DEV_COREDUMP
-	bool "Allow device coredump" if EXPERT
-	default y
-	help
-	  This option controls if the device coredump mechanism is available or
-	  not; if disabled, the mechanism will be omitted even if drivers that
-	  can use it are enabled.
-	  Say 'N' for more sensitive systems or systems that don't want
-	  to ever access the information to not have the code, nor keep any
-	  data.
-
-	  If unsure, say Y.
-
-config DEV_COREDUMP
-	bool
-	default y if WANT_DEV_COREDUMP
-	depends on ALLOW_DEV_COREDUMP
-
 config DEBUG_DRIVER
 	bool "Driver Core verbose debug messages"
 	depends on DEBUG_KERNEL
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 58154a9..53a0d73 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -81,7 +81,7 @@ config MFD_AXP20X
 
 config MFD_CROS_EC
 	tristate "Support ChromeOS Embedded Controller"
-	depends on MFD_CORE
+	select MFD_CORE
 	help
 	  If you say Y here you get support for the ChromeOS Embedded
 	  Controller (EC) providing keyboard, battery and power services.