]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 48087 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 28 Nov 2006 16:57:16 +0000 (16:57 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 28 Nov 2006 16:57:16 +0000 (16:57 +0000)
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

channels/chan_phone.c

index dd02c0e23b24c0df3295b5514aa23f1910be6ccd..73113d57e3f499d52a91bad7f7cd1a55a26c9f86 100644 (file)
@@ -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"