From: Joshua Colp <jcolp@digium.com>
Date: Tue, 28 Nov 2006 16:57:16 +0000 (+0000)
Subject: Merged revisions 48087 via svnmerge from
X-Git-Tag: 1.4.0-beta4~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68ad03e888dfe0fb6d2d147a6f9b6f09ff6c8cd9;p=thirdparty%2Fasterisk.git

Merged revisions 48087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48087 | file | 2006-11-28 11:56:01 -0500 (Tue, 28 Nov 2006) | 2 lines

According to the research I have done we never needed to include compiler.h in the first place so let's not! (issue #8430 reported by edguy3)

........


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

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index dd02c0e23b..73113d57e3 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -48,11 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <linux/telephony.h>
 /* Still use some IXJ specific stuff */
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-# include <linux/compiler.h>
-#endif
-#endif
 #include <linux/ixjuser.h>
 
 #include "asterisk/lock.h"