[asterisk-commits] jpeeler: branch 1.6.0 r160337 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Dec  2 12:05:32 2008
New Revision: 160337

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160337
Log:
Merged revisions 160333 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r160333 | jpeeler | 2008-12-02 12:04:51 -0600 (Tue, 02 Dec 2008) | 1 line

remove duplicate comment that I accidentally merged
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=160337&r1=160336&r2=160337
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Dec  2 12:05:32 2008
@@ -137,13 +137,6 @@
  * even though their web site says they support their products for life.
  */
 /* #define ZHONE_HACK */
-
-/*! \note
- * Define if you want to check the hook state for an FXO (FXS signalled) interface
- * before dialing on it.  Certain FXO interfaces always think they're out of
- * service with this method however.
- */
-/* #define DAHDI_CHECK_HOOKSTATE */
 
 /*! \note
  * Define if you want to check the hook state for an FXO (FXS signalled) interface