Merged revisions 47379 via svnmerge from

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

........
r47379 | file | 2006-11-09 11:48:05 -0500 (Thu, 09 Nov 2006) | 2 lines

Don't include compiler.h on kernels 2.6.18 and higher as, well, it's apparently going to be removed. This should make all you FC6 fans happy as your Asterisk will now build without any mods.

........

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

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 73c97386cd3716ada15c4bcd7bfec55b1df2c2d4..dd02c0e23b24c0df3295b5514aa23f1910be6ccd 100644 (file)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -49,8 +49,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 /* 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"