[asterisk-commits] file: trunk r48089 - in /trunk: ./ channels/chan_phone.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Nov 28 10:59:20 2006
New Revision: 48089

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48089
Log:
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_phone.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_phone.c?view=diff&rev=48089&r1=48088&r2=48089
==============================================================================
--- trunk/channels/chan_phone.c (original)
+++ trunk/channels/chan_phone.c Tue Nov 28 10:59:20 2006
@@ -48,11 +48,6 @@
 #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"