[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-148-gf93c5d2

[Fabien M <fa...@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  f93c5d282936c41b6abe64f606aa97c25645ffc4 (commit)
       via  ed277627077e5c11109832083256f87ed53d695d (commit)
      from  8f51ea04e31cc5c496e26cab4895b7db04d31e67 (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 f93c5d282936c41b6abe64f606aa97c25645ffc4
Merge: ed277627077e5c11109832083256f87ed53d695d 8f51ea04e31cc5c496e26cab4895b7db04d31e67
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Feb 1 14:52:51 2010 +0100

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

commit ed277627077e5c11109832083256f87ed53d695d
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Feb 1 14:51:45 2010 +0100

    [LINUX][MODULE] suppress debug message

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

Summary of changes:
 target/linux/modules/max1027/max1027.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/target/linux/modules/max1027/max1027.c b/target/linux/modules/max1027/max1027.c
index 28d2290..387fb61 100644
--- a/target/linux/modules/max1027/max1027.c
+++ b/target/linux/modules/max1027/max1027.c
@@ -182,7 +182,9 @@ static void inline max1027_wait_end_of_conv(struct max1027 *max1027)
 
 	delay = wait_event_timeout(max1027->conv_wq, max1027->status==0, msecs_to_jiffies(20));
 	if (delay == 0) {
+#ifdef DEBUG
 		printk("T%lu ", max1027->status);
+#endif
 		if (test_bit(CONVERSION_RUNNING, &max1027->status)) {
 			max1027->missed_eoc++;
 			clear_bit(CONVERSION_RUNNING, &max1027->status);


hooks/post-receive
-- 
armadeus