From 1ff1787e5ac43637c0d3590b03baf3961ef4fff4 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 30 Oct 2009 10:18:40 +0000 Subject: [PATCH] [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG svn path=/dists/sid/linux-2.6/; revision=14518 --- debian/changelog | 2 ++ debian/config/armel/config.kirkwood | 2 +- debian/config/armel/config.orion5x | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81f3abc6a..06fdfe05c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ 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 Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index fb832df4b..6e73f6753 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -626,5 +626,5 @@ CONFIG_X25=m ## # CONFIG_ARCH_IMX is not set CONFIG_MACH_OPENRD_CLIENT=y -CONFIG_ORION5X_WATCHDOG=m +CONFIG_ORION_WATCHDOG=m diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 8dabcf911..402a3e7f0 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -612,5 +612,5 @@ CONFIG_X25=m # 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