[zaptel-commits] file: branch 1.2 r1519 - in /branches/1.2: torisa.c zaptel.h zconfig.h

[zaptel-commits at lists.digium.com]

Author: file
Date: Thu Oct 19 20:23:26 2006
New Revision: 1519

URL: http://svn.digium.com/view/zaptel?rev=1519&view=rev
Log:
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:
    branches/1.2/torisa.c
    branches/1.2/zaptel.h
    branches/1.2/zconfig.h

Modified: branches/1.2/torisa.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/torisa.c?rev=1519&r1=1518&r2=1519&view=diff
==============================================================================
--- branches/1.2/torisa.c (original)
+++ branches/1.2/torisa.c Thu Oct 19 20:23:26 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: branches/1.2/zaptel.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel.h?rev=1519&r1=1518&r2=1519&view=diff
==============================================================================
--- branches/1.2/zaptel.h (original)
+++ branches/1.2/zaptel.h Thu Oct 19 20:23:26 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
 #ifdef CONFIG_ZAPATA_NET	
 #include <linux/hdlc.h>
 #endif

Modified: branches/1.2/zconfig.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/zconfig.h?rev=1519&r1=1518&r2=1519&view=diff
==============================================================================
--- branches/1.2/zconfig.h (original)
+++ branches/1.2/zconfig.h Thu Oct 19 20:23:26 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 */