[kernel] r14518 - in dists/sid/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Fri Oct 30 10:18:40 2009
New Revision: 14518

Log:
[armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/armel/config.kirkwood
   dists/sid/linux-2.6/debian/config/armel/config.orion5x

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Oct 30 09:15:13 2009	(r14517)
+++ dists/sid/linux-2.6/debian/changelog	Fri Oct 30 10:18:40 2009	(r14518)
@@ -2,6 +2,8 @@
 
   [ Martin Michlmayr ]
   * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270).
+  * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the
+    name of the config variable changed).
   * mips: fix build of vmlinux.lds (Closes: #552422).
 
  -- Martin Michlmayr <tbm at cyrius.com>  Tue, 27 Oct 2009 21:18:29 +0800

Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 09:15:13 2009	(r14517)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 10:18:40 2009	(r14518)
@@ -626,5 +626,5 @@
 ##
 # CONFIG_ARCH_IMX is not set
 CONFIG_MACH_OPENRD_CLIENT=y
-CONFIG_ORION5X_WATCHDOG=m
+CONFIG_ORION_WATCHDOG=m
 

Modified: dists/sid/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 09:15:13 2009	(r14517)
+++ dists/sid/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 10:18:40 2009	(r14518)
@@ -612,5 +612,5 @@
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_MSM7X00A is not set
-CONFIG_ORION5X_WATCHDOG=m
+CONFIG_ORION_WATCHDOG=m