Merged revisions 48088 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48088 | file | 2006-11-28 11:57:16 -0500 (Tue, 28 Nov 2006) | 10 lines

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/trunk@48089 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index c8c151262edfa0cf7331b34f788f0a5607427d06..cebbcd255f3132d848aeb9bd141710923608e553 100644 (file)
--- 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"