diff --git a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE b/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
deleted file mode 100644
index 1f5b92782..000000000
--- a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TWL4030_CORE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
index dcf57704b..5716e825c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
@@ -1 +1 @@
-CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TWL4030=m
diff --git a/baseconfig/powerpc/CONFIG_TWL4030_CORE b/baseconfig/powerpc/CONFIG_TWL4030_CORE
deleted file mode 100644
index 1f5b92782..000000000
--- a/baseconfig/powerpc/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TWL4030_CORE is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 1a2cae058..3bb492a3e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4888,7 +4888,7 @@ CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_TPS80031=m
-CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TWL4030=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 473e88371..16efc140f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4866,7 +4866,7 @@ CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_TPS80031=m
-CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TWL4030=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m