diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-28 16:59:20 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-28 16:59:20 +0000 |
| commit | 492e4c42fc69452c7670303b60b008cc1ef1e769 (patch) | |
| tree | 9589b6d5054f6c6628c89a2bb93f5b2be1b0763a /channels/chan_phone.c | |
| parent | 41ac55742c15205322a89d080ee135e1612c53af (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@48089 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index c8c151262..cebbcd255 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" |