[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.1-13-g2e8a532

[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  2e8a5329b0e61c5f477c80d3508629036b9e1e3c (commit)
       via  eefb0f3c759247fe470894c4e06afb9d07e7a48c (commit)
      from  dd37705384138b960c74eec39dc01af5f986bd88 (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 2e8a5329b0e61c5f477c80d3508629036b9e1e3c
Merge: eefb0f3 dd37705
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 10 16:17:04 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit eefb0f3c759247fe470894c4e06afb9d07e7a48c
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 10 16:14:01 2012 +0200

    [LINUX]: enable test kernel watchdog driver

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

Summary of changes:
 .../apf9328/apf9328test-linux-2.6.29.config        |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
index 21c2630..78340fb 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
@@ -831,7 +831,19 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IMX_WDT=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #


hooks/post-receive
-- 
armadeus