[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-288-g7c6a388

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7c6a3887cfe7fa5cb9ffd7ed0a0c238106d9c7dc (commit)
      from  0d340adcd9dfce419a70a1ae97f4e000ad9f9b82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c6a3887cfe7fa5cb9ffd7ed0a0c238106d9c7dc
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 24 11:39:46 2012 +0200

    [LINUX] APF27: Add resident imx watchdog to linux 2.6.29

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf27/apf27-linux-2.6.29.config       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index eb35e88..80fff22 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -974,13 +974,13 @@ CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_NOWAYOUT=y
 
 #
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
-CONFIG_IMX_WDT=m
+CONFIG_IMX_WDT=y
 
 #
 # USB-based Watchdog Cards


hooks/post-receive
-- 
armadeus