1 files changed, 0 insertions, 13 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index 9fd8eeddf..c3d1703ac 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -42,13 +42,7 @@
 #include <asm/io.h>
 #include "compat.h"
 #include <media/v4l2-common.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#define strlcpy(dest,src,len) strncpy(dest,src,(len)-1)
-#else
 #include <linux/device.h>
-#endif
 #include <media/videobuf-dma-sg.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
@@ -272,14 +266,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
 /* ---------------------------------------------------------- */
 /* bttv-gpio.c */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-
 extern struct bus_type bttv_sub_bus_type;
 int bttv_sub_add_device(struct bttv_core *core, char *name);
 int bttv_sub_del_devices(struct bttv_core *core);
 
-#endif
-
 /* ---------------------------------------------------------- */
 /* bttv-driver.c                                              */
 
@@ -318,9 +308,6 @@ struct bttv_input {
 };
 
 struct bttv_suspend_state {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-	u32  pci_cfg[64 / sizeof(u32)];
-#endif
 	u32  gpio_enable;
 	u32  gpio_data;
 	int  disabled;