--- zzzz-none-000/linux-2.6.39.4/drivers/watchdog/Kconfig	2011-08-03 19:43:28.000000000 +0000
+++ puma6-arm-6490-729/linux-2.6.39.4/drivers/watchdog/Kconfig	2021-11-10 13:23:10.000000000 +0000
@@ -4,6 +4,7 @@
 
 menuconfig WATCHDOG
 	bool "Watchdog Timer Support"
+	default y
 	---help---
 	  If you say Y here (and to one of the following options) and create a
 	  character special file /dev/watchdog with major number 10 and minor
@@ -72,6 +73,14 @@
 # ALPHA Architecture
 
 # ARM Architecture
+config ARM_AVALANCHE_WDTIMER
+        tristate "Avalanche Watch Dog Timer support"
+		depends on WATCHDOG && (MACH_PUMA5 || MACH_PUMA6)
+        default y
+        help
+      Choose Y here if you wish to use the Avalanche Watch Dog Timer
+      facility. If unsure, choose Y.
+
 
 config ARM_SP805_WATCHDOG
 	tristate "ARM SP805 Watchdog"
@@ -533,6 +542,17 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called i6300esb.
 
+config INTELCE_WDT
+        tristate "Intel Watchdog for CE2600"
+        depends on (X86 && PCI) && ARCH_GEN3
+	default m
+        ---help---
+          Hardware driver for the watchdog timer built into the Intel
+          CE2600 platform.
+
+          To compile this driver as a module, choose M here: the
+          module will be called intelce_wdt.
+
 config INTEL_SCU_WATCHDOG
 	bool "Intel SCU Watchdog for Mobile Platforms"
 	depends on WATCHDOG
@@ -601,7 +621,6 @@
 config HP_WATCHDOG
 	tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
 	depends on X86
-	default m
 	help
 	  A software monitoring watchdog and NMI sourcing driver. This driver
 	  will detect lockups and provide a stack trace. This is a driver that
@@ -612,7 +631,6 @@
 config HPWDT_NMI_DECODING
 	bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
 	depends on HP_WATCHDOG
-	default y
 	help
 	  When an NMI occurs this feature will make the necessary BIOS calls to
 	  log the cause of the NMI.