---

yaml --- r: 138287 b: refs/heads/master c: 4ecbc28 h: refs/heads/master i: 138285: 4b59601 138283: 9fe6bab 138279: b261d6b 138271: 3a0d8ee v: v3
git-mirror · Mar 30, 2009 · 470af80 · 470af80
1 parent e3f3c68
commit 470af80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c59df818001b0bd3a31e2301a92a8c73bccbce
+refs/heads/master: 4ecbc28d3df967ee52dd9d060bc56d4a85196bdf
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -111,7 +111,7 @@ typedef void (*pvr2_subdev_update_func)(struct pvr2_hdw *,
 					struct v4l2_subdev *);
 
 static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
-	[PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_update,
+	[PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_subdev_update,
 	[PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update,
 };
 

diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -160,7 +160,7 @@ int pvr2_i2c_wm8775_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 }
 
 
-void pvr2_wm8775_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
+void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
 	if (hdw->input_dirty) {
 		struct v4l2_routing route;

diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-wm8775.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-wm8775.h
@@ -39,7 +39,7 @@
 int pvr2_i2c_wm8775_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);
 #include "pvrusb2-hdw-internal.h"
 
-void pvr2_wm8775_update(struct pvr2_hdw *, struct v4l2_subdev *sd);
+void pvr2_wm8775_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *sd);
 
 
 #endif /* __PVRUSB2_WM8775_H */