Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / linux / videodev.h

diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 23276cede54017fdb9cf2ece42b78d967fcc68b4..91140091ced2f2b510a3ac2bf05d79d738078f0e 100644 (file)
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -27,6 +27,7 @@ video_device_remove_file(struct video_device *vfd,
        class_device_remove_file(&vfd->class_dev, attr);
 }
 
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *dev)
 {
@@ -37,6 +38,7 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
 {
        dev->priv = data;
 }
+#endif
 
 extern int video_exclusive_open(struct inode *inode, struct file *file);
 extern int video_exclusive_release(struct inode *inode, struct file *file);