From: Ian Abbott <abbotti@mev.co.uk>
Date: Tue, 24 Jul 2007 17:47:21 +0000 (+0000)
Subject: Removed include/linux/devfs_fs_kernel.h
X-Git-Tag: r0_7_74~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c9dd2e05bec9a392c7303de57ba7726d9180fc2;p=comedi.git

Removed include/linux/devfs_fs_kernel.h
We don't need it now and it causes build to fail for kernel 2.6.23-rc1.
---

diff --git a/Makefile.am b/Makefile.am
index 0c5f5d99..15841bd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,6 @@ EXTRA_DIST = autogen.sh \
 	include/linux/compiler.h \
 	include/linux/config.h \
 	include/linux/delay.h \
-	include/linux/devfs_fs_kernel.h \
 	include/linux/device.h \
 	include/linux/interrupt.h \
 	include/linux/isapnp.h \
diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 03ba8481..56c8b770 100644
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -38,7 +38,6 @@
 #include <linux/kmod.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/device.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
deleted file mode 100644
index b3fe6e3c..00000000
--- a/include/linux/devfs_fs_kernel.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * linux/devfs_fs_kernel.h compatibility header
- */
-
-#ifndef __COMPAT_LINUX_DEVFS_FS_KERNEL_H_
-#define __COMPAT_LINUX_DEVFS_FS_KERNEL_H_
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
-
-#define DEVFS_FL_DEFAULT 0
-#define DEVFS_SPECIAL_CHR 0
-
-typedef struct devfs_entry * devfs_handle_t;
-
-static inline int devfs_register_chrdev (unsigned int major, const char *name,
-	struct file_operations *fops)
-{
-	return register_chrdev (major, name, fops);
-}
-
-static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
-{
-	return unregister_chrdev (major, name);
-}
-
-static inline devfs_handle_t devfs_register (devfs_handle_t dir,
-	const char *name, unsigned int flags, unsigned int major,
-	unsigned int minor, umode_t mode, void *ops, void *info)
-{
-	return NULL;
-}
-
-static inline void devfs_unregister (devfs_handle_t de)
-{
-}
-
-static inline devfs_handle_t devfs_find_handle (devfs_handle_t dir,
-	const char *name, unsigned int major, unsigned int minor,
-	char type, int traverse_symlinks)
-{
-	    return NULL;
-}
-
-#else
-#include_next <linux/devfs_fs_kernel.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
-#define devfs_find_handle(dir, name, major, minor, type, traverse) devfs_find_handle(dir, name, strlen(name), major, minor, type, traverse)
-#endif
-
-#endif
-
-#endif
-