This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / media / dvb / dvb-core / dvbdev.h

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index 333ada7..fc4700f 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -28,7 +28,6 @@
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/devfs_fs_kernel.h>
-#include <linux/smp_lock.h>
 
 #define DVB_MAJOR 212
 
@@ -49,7 +48,6 @@ struct dvb_adapter {
        struct list_head device_list;
        const char *name;
        u8 proposed_mac [6];
-       void* priv;
 
        struct module *module;
 };
@@ -94,15 +92,5 @@ extern int dvb_generic_open (struct inode *inode, struct file *file);
 extern int dvb_generic_release (struct inode *inode, struct file *file);
 extern int dvb_generic_ioctl (struct inode *inode, struct file *file,
                              unsigned int cmd, unsigned long arg);
-
-/* we don't mess with video_usercopy() any more,
-we simply define out own dvb_usercopy(), which will hopefully become
-generic_usercopy()  someday... */
-
-extern int dvb_usercopy(struct inode *inode, struct file *file,
-                           unsigned int cmd, unsigned long arg,
-                           int (*func)(struct inode *inode, struct file *file,
-                           unsigned int cmd, void *arg));
-
 #endif /* #ifndef _DVBDEV_H_ */