[kernel] r17518 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Mon May 30 22:30:12 2011
New Revision: 17518

Log:
[x86] watchdog: Enable NV_TCO as module

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 22:28:38 2011	(r17517)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 22:30:12 2011	(r17518)
@@ -36,7 +36,7 @@
   * pps: Enable PPS_CLIENT_PARPORT as module
   * ptp: Enable PTP_1588_CLOCK, PTP_1588_CLOCK_GIANFAR,
     PTP_1588_CLOCK_IXP46X as modules
-  * [x86] watchdog: Enable SP5100_TCO as module
+  * [x86] watchdog: Enable SP5100_TCO, NV_TCO as modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon May 30 22:28:38 2011	(r17517)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon May 30 22:30:12 2011	(r17518)
@@ -1320,6 +1320,7 @@
 CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_SC1200_WDT=m
+CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m