linux-5.4.46: Build watchdog drivers as modules

Building them into the Linux kernel causes resource conflicts. Resolves: #1821
mariux64 · Jul 28, 2020 · b31f3c6 · b31f3c6
1 parent 8413eb2
commit b31f3c6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/linux-5.4.46-337.bee b/linux-5.4.46-337.bee
@@ -615,6 +615,7 @@ mee_configure() {
 	CONFIG_I2C_AMD756=m
 	CONFIG_I2C_AMD756_S4882=m
 	CONFIG_I2C_AMD8111=m
+	CONFIG_I2C_I801=y
 	CONFIG_I2C_ISCH=m
 	CONFIG_I2C_PIIX4=m
 	CONFIG_I2C_NFORCE2=m
@@ -626,11 +627,13 @@ mee_configure() {
 	CONFIG_I2C_VIAPRO=m
 	CONFIG_GPIOLIB=y
 	CONFIG_WATCHDOG=y
-	CONFIG_I6300ESB_WDT=y
-	CONFIG_ITCO_WDT=y
+	CONFIG_WATCHDOG_CORE=y
+	CONFIG_I6300ESB_WDT=m
+	CONFIG_ITCO_WDT=m
 	CONFIG_ITCO_VENDOR_SUPPORT=y
-	CONFIG_HP_WATCHDOG=y
-	CONFIG_NV_TCO=y
+	CONFIG_HP_WATCHDOG=m
+	CONFIG_NV_TCO=m
+	CONFIG_LPC_ICH=y
 	CONFIG_MEDIA_SUPPORT=y
 	CONFIG_AGP=y
 	CONFIG_AGP_AMD64=y