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)

........

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


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1521 5390a7c7-147a-4af0-8ec9-7488f05a26cb

3 files changed, 9 insertions, 3 deletions

diff --git a/torisa.c b/torisa.c
index e969cba..a037af5 100644
--- a/torisa.c
+++ b/torisa.c
@@ -19,8 +19,10 @@
  *                     original by Jim Dixon <jim@lambdatel.com>
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#endif
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/zaptel.h b/zaptel.h
index 97954eb..17a7503 100644
--- a/zaptel.h
+++ b/zaptel.h
@@ -32,8 +32,10 @@
 
 #ifdef __KERNEL__
 #include "zconfig.h"
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#endif
 #include <linux/fs.h>
 #include <linux/ioctl.h>
 
diff --git a/zconfig.h b/zconfig.h
index 603def6..d98f428 100644
--- a/zconfig.h
+++ b/zconfig.h
@@ -6,8 +6,10 @@
 #define _ZCONFIG_H
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#include <linux/config.h>
+#endif
 #endif
 
 /* Zaptel compile time options */