2 files changed, 2 insertions, 14 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c
index b9e38c849..3446ab458 100644
--- a/linux/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c
@@ -75,10 +75,6 @@
 #define IVTV_REG_I2C_GETSCL_OFFSET 0x7008
 #define IVTV_REG_I2C_GETSDA_OFFSET 0x700c
 
-#ifndef I2C_ADAP_CLASS_TV_ANALOG
-#define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG
-#endif /* I2C_ADAP_CLASS_TV_ANALOG */
-
 #define IVTV_CS53L32A_I2C_ADDR		0x11
 #define IVTV_M52790_I2C_ADDR		0x48
 #define IVTV_CX25840_I2C_ADDR 		0x44
@@ -564,9 +560,7 @@ static struct i2c_adapter ivtv_i2c_adap_hw_template = {
 	.client_unregister = detach_inform,
 	.owner = THIS_MODULE,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-	.class = I2C_ADAP_CLASS_TV_ANALOG,
-#endif
+	.class = I2C_CLASS_TV_ANALOG,
 #endif
 };
 
@@ -622,9 +616,7 @@ static struct i2c_adapter ivtv_i2c_adap_template = {
 	.client_unregister = detach_inform,
 	.owner = THIS_MODULE,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-	.class = I2C_ADAP_CLASS_TV_ANALOG,
-#endif
+	.class = I2C_CLASS_TV_ANALOG,
 #endif
 };
 
diff --git a/linux/drivers/media/video/ivtv/ivtv-streams.c b/linux/drivers/media/video/ivtv/ivtv-streams.c
index d2dd89519..f8883b487 100644
--- a/linux/drivers/media/video/ivtv/ivtv-streams.c
+++ b/linux/drivers/media/video/ivtv/ivtv-streams.c
@@ -49,9 +49,7 @@ static const struct file_operations ivtv_v4l2_enc_fops = {
 	.write = ivtv_v4l2_write,
 	.open = ivtv_v4l2_open,
 	.ioctl = ivtv_v4l2_ioctl,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
 	.compat_ioctl = v4l_compat_ioctl32,
-#endif
 	.release = ivtv_v4l2_close,
 	.poll = ivtv_v4l2_enc_poll,
 };
@@ -62,9 +60,7 @@ static const struct file_operations ivtv_v4l2_dec_fops = {
 	.write = ivtv_v4l2_write,
 	.open = ivtv_v4l2_open,
 	.ioctl = ivtv_v4l2_ioctl,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
 	.compat_ioctl = v4l_compat_ioctl32,
-#endif
 	.release = ivtv_v4l2_close,
 	.poll = ivtv_v4l2_dec_poll,
 };