From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 19 Feb 2009 16:45:02 +0000 (+0000)
Subject: Fix another merge error from 176708
X-Git-Tag: 1.6.2.0-beta1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef84acf0023cf1055d8dcb6689ba6671844115c8;p=thirdparty%2Fasterisk.git

Fix another merge error from 176708



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 533e8b6bc9..39b302fc8c 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -572,7 +572,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 */