From: Automerge Script <automerge@asterisk.org>
Date: Mon, 29 Jan 2007 17:02:13 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c58c4e83a245712ed4591d8f17560ea9ef70ab82;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index 5f9fe939f2..40c7d4cb2b 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include <zaptel/zaptel.h>
+#include <linux/zaptel.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"