automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago · c58c4e83a2
parent 2911d1ab26
commit c58c4e83a2
1 changed files with 1 additions and 1 deletions
--- 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"