From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Tue, 3 Oct 2006 13:36:00 +0000 (+0200)
Subject: Merge: Do not attempt to include removed devfs_fs_kernel.h file for 2.6.18+ kernel.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/db1e8cdc41197ba3341ee794bd7e8170a30a1f05?hp=6de5c18959721ad99ff7ffdfd10e5a8038e8b133

Merge: Do not attempt to include removed devfs_fs_kernel.h file for 2.6.18+ kernel.

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/include/kthread.h b/lincan/include/kthread.h
index 1450f81..2d3ee56 100644
--- a/lincan/include/kthread.h
+++ b/lincan/include/kthread.h
@@ -10,7 +10,9 @@
   #include <linux/tqueue.h>
   #define tasklet_struct tq_struct
 #else
-  #include <linux/devfs_fs_kernel.h>
+  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+    #include <linux/devfs_fs_kernel.h>
+  #endif
 #endif
 
 #include <linux/wait.h>
diff --git a/lincan/src/kthread.c b/lincan/src/kthread.c
index cce9ff5..4e574a9 100644
--- a/lincan/src/kthread.c
+++ b/lincan/src/kthread.c
@@ -10,7 +10,9 @@
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,40))
   #include <linux/tqueue.h>
 #else
-  #include <linux/devfs_fs_kernel.h>
+  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+    #include <linux/devfs_fs_kernel.h>
+  #endif
 #endif
 
 #include <linux/wait.h>