Subject: [PATCH] Enable hpwdt module

---
 debian.master/config/amd64/config.flavour.generic  |    1 +
 debian.master/config/amd64/config.flavour.virtual  |    1 +
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.common.armhf     |    1 +
 debian.master/config/config.common.ubuntu          |    2 +-
 debian.master/config/i386/config.flavour.generic   |    1 +
 .../config/i386/config.flavour.generic-pae         |    1 +
 debian.master/config/i386/config.flavour.virtual   |    1 +
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64/config.common.ppc64     |    1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index cde79d6..a53755e 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -4,6 +4,7 @@
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_HP_WATCHDOG=m
 CONFIG_INTEL_IDLE=y
 CONFIG_NR_CPUS=256
 # CONFIG_PREEMPT_NONE is not set
diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index 0821ca2..2080b14 100644
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -4,6 +4,7 @@
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_HP_WATCHDOG is not set
 # CONFIG_INTEL_IDLE is not set
 CONFIG_NR_CPUS=64
 CONFIG_PREEMPT_NONE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 2450c2d..f7dad29 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -94,6 +94,7 @@ CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
+# CONFIG_HP_WATCHDOG is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 # CONFIG_HUGETLB_PAGE is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 8cf8e0a..bb836c8 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -47,6 +47,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+# CONFIG_HP_WATCHDOG is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 67d87fa..3346500 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2070,9 +2070,9 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPFS_FS=m
 CONFIG_HPLAN=m
 CONFIG_HPLAN_PLUS=m
+CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_HP_ACCEL=m
 CONFIG_HP_ILO=m
-# CONFIG_HP_WATCHDOG is not set
 CONFIG_HP_WMI=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HT_IRQ=y
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index 71cac35..52f1fd2 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -6,6 +6,7 @@
 CONFIG_GPIO_CS5535=y
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
+CONFIG_HP_WATCHDOG=m
 CONFIG_I2C_PXA_PCI=y
 CONFIG_INTEL_IDLE=y
 # CONFIG_IOMMU_HELPER is not set
diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index 0fdc77c..8161624 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -6,6 +6,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_GPIO_CS5535=m
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
+# CONFIG_HP_WATCHDOG is not set
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_INTEL_IDLE=y
 CONFIG_IOMMU_HELPER=y
diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
index 08c2b93..5ab4106 100644
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -6,6 +6,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_GPIO_CS5535=m
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
+# CONFIG_HP_WATCHDOG is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_INTEL_IDLE is not set
 CONFIG_IOMMU_HELPER=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index be8b572..ef8980e 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -92,6 +92,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
+# CONFIG_HP_WATCHDOG is not set
 CONFIG_HTC_I2CPLD=y
 # CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 8ef1cb9..7cd69f4 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -102,6 +102,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
+# CONFIG_HP_WATCHDOG is not set
 CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HVC_CONSOLE=y
-- 
1.7.9.5

