V4L/DVB (8428): videodev: rename 'dev' to 'parent'

[linux-2.6] / include / media / v4l2-dev.h

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 33f379b1ecfeac87bfaf3d0c3cdf92137e8af802..5ae261fbcb7eccfec37b112d8352edf8d431ea81 100644 (file)
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -89,7 +89,7 @@ struct video_device
 
        /* sysfs */
        struct device class_dev;        /* v4l device */
-       struct device *dev;             /* device parent */
+       struct device *parent;          /* device parent */
 
        /* device info */
        char name[32];