[kernel] r14861 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Sun Jan  3 23:51:51 2010
New Revision: 14861

Log:
topconfig enable modular WM831X_WATCHDOG

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jan  3 23:51:45 2010	(r14860)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jan  3 23:51:51 2010	(r14861)
@@ -14,7 +14,7 @@
     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 ]

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Jan  3 23:51:45 2010	(r14860)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Jan  3 23:51:51 2010	(r14861)
@@ -2508,6 +2508,7 @@
 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