From e90f8acd2e798771100a8468923040cb41a1675d Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Sun, 3 Jan 2010 23:51:51 +0000
Subject: [PATCH] topconfig enable modular WM831X_WATCHDOG

svn path=/dists/trunk/linux-2.6/; revision=14861
---
 debian/changelog     | 2 +-
 debian/config/config | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b591c5f79..0418a623b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ linux-2.6 (2.6.32-4) UNRELEASED; urgency=low
     KS8851, KS8851_MLL, MISDN_AVMFRITZ, MISDN_SPEEDFAX, MISDN_INFINEON,
     MISDN_W6692, MISDN_NETJET, INPUT_WINBOND_CIR, BATTERY_DS2782, MFD_WM831X,
     MFD_MC13783, MTD_SST25L, TOUCHSCREEN_USB_E2I, INPUT_WM831X_ON,
-    SENSORS_WM831X.
+    SENSORS_WM831X, WM831X_WATCHDOG.
   * [x86] set ACPI_POWER_METER, ACPI_PROCESSOR_AGGREGATOR.
 
   [ dann frazier ]
diff --git a/debian/config/config b/debian/config/config
index b48baf882..f57dee9fb 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2508,6 +2508,7 @@ CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_ITCO_WDT=m