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 1450f81f62979fcf4985a267bf45f5f86116f2bc..2d3ee563ad950e56b6397965397745f3783f384a 100644 (file)
--- 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 cce9ff53bf993d1632e2f60112294f37485f094e..4e574a9e9c42af9f2d3cebd94490f00792ef785c 100644 (file)
--- 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>