automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@58432 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/dsp.c b/dsp.c
index f23f45b6a9abee69e50090a41e47ecfbc57c6c61..c86354f363e872b09b1e487d0e4576b8b14f7236 100644 (file)
--- a/dsp.c
+++ b/dsp.c
@@ -1292,8 +1292,10 @@ 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;
 }