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

[Martin Michlmayr]

Author: tbm
Date: Sun Feb 22 19:06:12 2009
New Revision: 12920

Log:
[arm/ixp4xx] Make IXP4XX_WATCHDOG modular.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Feb 22 19:06:12 2009
@@ -26,6 +26,7 @@
   * [mips/r5k-ip32] Build in RTC_DRV_CMOS.
   * [arm/versatile, arm/iop32x, arm/ixp4xx] Make LLC2 modular.
   * [arm, mips, mipsel] Make MII modular.
+  * [arm/ixp4xx] Make IXP4XX_WATCHDOG modular.
 
  -- maximilian attems <maks at debian.org>  Thu, 19 Feb 2009 13:25:20 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Sun Feb 22 19:06:12 2009
@@ -760,7 +760,7 @@
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_SOFT_WATCHDOG is not set
-CONFIG_IXP4XX_WATCHDOG=y
+CONFIG_IXP4XX_WATCHDOG=m
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_WDTPCI is not set
 # CONFIG_USBPCWATCHDOG is not set