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 5f9fe939f26e36155478966859cba3bc13440c39..40c7d4cb2b8c6db8346b07275d7bd9c013070811 100644 (file)
--- 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"