From fff4e4f7cd324f44e54b6b88f0c04a08c53baa41 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 19 Feb 2009 16:45:30 +0000
Subject: [PATCH] Merged revisions 177387 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r177387 | jpeeler | 2009-02-19 10:45:02 -0600 (Thu, 19 Feb 2009) | 3 lines

  Fix another merge error from 176708
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk/channel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 2814fac942..d42da81b01 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -608,7 +608,7 @@ enum {
 	AST_FEATURE_PARKCALL =     (1 << 5),
 	AST_FEATURE_AUTOMIXMON =   (1 << 6),
 	AST_FEATURE_NO_H_EXTEN =   (1 << 7),
-	AST_FEATURE_WARNING_ACTIVE = (1 << 7),
+	AST_FEATURE_WARNING_ACTIVE = (1 << 8),
 };
 
 /*! \brief bridge configuration */