From 14dd3b2f1a543794158a3d9394e294105b5111f1 Mon Sep 17 00:00:00 2001
From: Automerge Script <automerge@asterisk.org>
Date: Wed, 11 Jul 2007 17:31:25 +0000
Subject: [PATCH] automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/Makefile     | 4 ++++
 channels/chan_phone.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/channels/Makefile b/channels/Makefile
index 3a2ad6871f..5c448d62ae 100644
--- 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 669e87507d..54cadc2081 100644
--- 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>