3 files changed, 1 insertions, 19 deletions
diff --git a/linux/include/media/pwc-ioctl.h b/linux/include/media/pwc-ioctl.h
index 6e32ef4e2..0f19779c4 100644
--- a/linux/include/media/pwc-ioctl.h
+++ b/linux/include/media/pwc-ioctl.h
@@ -55,12 +55,7 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 10)
-/* Compatibility for older kernel */
-typedef __u16 __le16;
-#endif
-
- /* Enumeration of image sizes */
+/* Enumeration of image sizes */
 #define PSZ_SQCIF	0x00
 #define PSZ_QSIF	0x01
 #define PSZ_QCIF	0x02
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h
index 178989285..fb356eb57 100644
--- a/linux/include/media/v4l2-dev.h
+++ b/linux/include/media/v4l2-dev.h
@@ -96,11 +96,7 @@ struct video_device
 #endif
 
 	/* sysfs */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
 	struct device class_dev;	/* v4l device */
-#else
-	struct class_device class_dev;
-#endif
 	struct device *dev;		/* device parent */
 
 	/* device info */
@@ -396,13 +392,8 @@ extern int video_usercopy(struct inode *inode, struct file *file,
 #include <linux/mm.h>
 
 static inline int __must_check
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-video_device_create_file(struct video_device *vfd,
-			 struct class_device_attribute *attr)
-#else
 video_device_create_file(struct video_device *vfd,
 			 struct device_attribute *attr)
-#endif
 {
 	int ret = device_create_file(&vfd->class_dev, attr);
 	if (ret < 0)
diff --git a/linux/include/media/videobuf-dvb.h b/linux/include/media/videobuf-dvb.h
index 14438bc98..84886be5e 100644
--- a/linux/include/media/videobuf-dvb.h
+++ b/linux/include/media/videobuf-dvb.h
@@ -20,11 +20,7 @@ struct videobuf_dvb {
 	int                        nfeeds;
 
 	/* videobuf_dvb_(un)register manges this */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	struct dvb_adapter         adapter;
-#else
-	struct dvb_adapter         *adapter;
-#endif
 	struct dvb_demux           demux;
 	struct dmxdev              dmxdev;
 	struct dmx_frontend        fe_hw;