[zaptel-commits] file: trunk r1521 - in /trunk: ./ torisa.c zaptel.h zconfig.h

[zaptel-commits at lists.digium.com]

Author: file
Date: Thu Oct 19 20:29:25 2006
New Revision: 1521

URL: http://svn.digium.com/view/zaptel?rev=1521&view=rev
Log:
Merged revisions 1520 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1520 | file | 2006-10-19 21:26:29 -0400 (Thu, 19 Oct 2006) | 10 lines

Merged revisions 1519 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1519 | file | 2006-10-19 21:23:26 -0400 (Thu, 19 Oct 2006) | 2 lines

Later distros have now taken to removing this file as it has been deprecated for awhile now... so on kernels 2.6.18 or higher we can safely not include it. (props to jsmith)

........

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

Modified:
    trunk/   (props changed)
    trunk/torisa.c
    trunk/zaptel.h
    trunk/zconfig.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-blocked (original)
+++ branch-1.4-blocked Thu Oct 19 20:29:25 2006
@@ -1,0 +1,1 @@
+/branches/1.2:1517

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Oct 19 20:29:25 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507
+/branches/1.4:1-1471,1490,1500,1507,1520

Modified: trunk/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?rev=1521&r1=1520&r2=1521&view=diff
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Thu Oct 19 20:29:25 2006
@@ -19,8 +19,10 @@
  *                     original by Jim Dixon <jim at lambdatel.com>
  */
 
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 #include <linux/config.h>
-#include <linux/version.h>
+#endif
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>

Modified: trunk/zaptel.h
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.h?rev=1521&r1=1520&r2=1521&view=diff
==============================================================================
--- trunk/zaptel.h (original)
+++ trunk/zaptel.h Thu Oct 19 20:29:25 2006
@@ -32,8 +32,10 @@
 
 #ifdef __KERNEL__
 #include "zconfig.h"
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 #include <linux/config.h>
-#include <linux/version.h>
+#endif
 #include <linux/fs.h>
 #include <linux/ioctl.h>
 

Modified: trunk/zconfig.h
URL: http://svn.digium.com/view/zaptel/trunk/zconfig.h?rev=1521&r1=1520&r2=1521&view=diff
==============================================================================
--- trunk/zconfig.h (original)
+++ trunk/zconfig.h Thu Oct 19 20:29:25 2006
@@ -6,8 +6,10 @@
 #define _ZCONFIG_H
 
 #ifdef __KERNEL__
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 #include <linux/config.h>
-#include <linux/version.h>
+#endif
 #endif
 
 /* Zaptel compile time options */