automerge commit

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

diff --git a/channels/Makefile b/channels/Makefile
index 3a2ad6871f129f755604983002114cad4e7cfb9c..5c448d62aee87d8c7a51f52c5bf40f33bfa20756 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -79,6 +79,10 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard
   CHANNEL_LIBS+=chan_phone.so
 endif
 
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/compiler.h),)
+  CFLAGS+=-DHAVE_LINUX_COMPILER_H
+endif
+
 ifneq ($(wildcard h323/libchanh323.a),)
   CHANNEL_LIBS+=chan_h323.so
 endif

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 669e87507d50e7e9844c092690de01662511d01b..54cadc2081c5ee65f1f3c98ba82b2e676263cba1 100644 (file)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -34,6 +34,9 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
 #include <linux/telephony.h>
 /* Still use some IXJ specific stuff */
 #include <linux/version.h>