summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-07-19 11:43:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-07-19 11:43:17 -0300
commita9e9a6602d4ad20320cee50abb6568d03799e1a6 (patch)
tree99e1e30bc8bb46aef497a2c6fc74d1c50d5a772c /linux/include/media
parent8ca6277222be28b84f147cba6e1d5a7486142b0d (diff)
downloadmediapointer-dvb-s2-a9e9a6602d4ad20320cee50abb6568d03799e1a6.tar.gz
mediapointer-dvb-s2-a9e9a6602d4ad20320cee50abb6568d03799e1a6.tar.bz2
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: backport from kernel to v4l/dvb tree Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/v4l2-dev.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h
index 171a63f65..8c3fd8fdd 100644
--- a/linux/include/media/v4l2-dev.h
+++ b/linux/include/media/v4l2-dev.h
@@ -13,9 +13,6 @@
#include <linux/poll.h>
#include <linux/fs.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)
-#include <linux/devfs_fs_kernel.h>
-#endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
#include <linux/device.h>
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
@@ -341,11 +338,6 @@ void *priv;
#else
struct semaphore lock; /* ... helper function uses these */
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)
- devfs_handle_t devfs_handle; /* devfs */
-#else
- char devfs_name[64]; /* devfs */
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
struct class_device class_dev; /* sysfs */
#endif