3 files changed, 1 insertions, 60 deletions
diff --git a/linux/include/linux/.cvsignore b/linux/include/linux/.cvsignore
deleted file mode 100644
index c095fc3ef..000000000
--- a/linux/include/linux/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dvb
-\ No newline at end of file
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index 6e769cdb0..5d46a8d2a 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -1246,8 +1246,7 @@ extern char *v4l2_type_names[];
 typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
 			   unsigned int cmd, void *arg);
 
-#if defined(CONFIG_VIDEO_V4L1_COMPAT) || \
-	defined(CONFIG_VIDEO_V4L1_COMPAT_MODULE)
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
 			       int cmd, void *arg, v4l2_kioctl driver_ioctl);
 #else
diff --git a/linux/include/media/i2c-compat.h b/linux/include/media/i2c-compat.h
deleted file mode 100644
index 39fa183fa..000000000
--- a/linux/include/media/i2c-compat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: i2c-compat.h,v 1.3 2005/10/16 12:13:58 mchehab Exp $
- *
- * some i2c layer compatibility stuff -- to avoid cluttering up the
- * i2c modules with tons of #ifdefs
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,66)
-
-static inline void *i2c_get_adapdata(struct i2c_adapter *dev)
-{
-	return dev->data;
-}
-
-static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
-{
-	dev->data = data;
-}
-
-static inline void *i2c_get_clientdata(struct i2c_client *dev)
-{
-	return dev->data;
-}
-
-static inline void i2c_set_clientdata(struct i2c_client *dev, void *data)
-{
-	dev->data = data;
-}
-
-#define I2C_DEVNAME(str)   .name = str
-
-static inline char *i2c_clientname(struct i2c_client *c)
-{
-	return c->name;
-}
-
-static inline void i2c_clients_command(struct i2c_adapter *adap,
-				       unsigned int cmd, void *arg)
-{
-	int i;
-
-	for (i = 0; i < I2C_CLIENT_MAX; i++) {
-		if (NULL == adap->clients[i])
-			continue;
-		if (NULL == adap->clients[i]->driver->command)
-			continue;
-		adap->clients[i]->driver->command(adap->clients[i],cmd,arg);
-	}
-}
-
-#endif
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */