automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@58432 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 0 deletions

diff --git a/dsp.c b/dsp.c
index f23f45b6a..c86354f36 100644
--- a/dsp.c
+++ b/dsp.c
@@ -1292,9 +1292,11 @@ int ast_dsp_busydetect(struct ast_dsp *dsp)
 	}
 #endif
 #if 1
+#ifndef BUSYDETECT_TONEONLY
 	if (res)
 		ast_log(LOG_DEBUG, "ast_dsp_busydetect detected busy, avgtone: %d, avgsilence %d\n", avgtone, avgsilence);
 #endif
+#endif
 	return res;
 }
 #endif