diff options
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-wm8775.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 8a96f260af5b..7269110a3bc2 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -111,7 +111,7 @@ typedef void (*pvr2_subdev_update_func)(struct pvr2_hdw *, | |||
111 | struct v4l2_subdev *); | 111 | struct v4l2_subdev *); |
112 | 112 | ||
113 | static const pvr2_subdev_update_func pvr2_module_update_functions[] = { | 113 | static const pvr2_subdev_update_func pvr2_module_update_functions[] = { |
114 | [PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_update, | 114 | [PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_subdev_update, |
115 | [PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update, | 115 | [PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update, |
116 | }; | 116 | }; |
117 | 117 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 40b221fe8027..a099bf1641e5 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/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) | |||
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | void pvr2_wm8775_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | 163 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) |
164 | { | 164 | { |
165 | if (hdw->input_dirty) { | 165 | if (hdw->input_dirty) { |
166 | struct v4l2_routing route; | 166 | struct v4l2_routing route; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h b/drivers/media/video/pvrusb2/pvrusb2-wm8775.h index d2d4e7eb1107..a304988b1e79 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.h | |||
@@ -39,7 +39,7 @@ | |||
39 | int pvr2_i2c_wm8775_setup(struct pvr2_hdw *,struct pvr2_i2c_client *); | 39 | int pvr2_i2c_wm8775_setup(struct pvr2_hdw *,struct pvr2_i2c_client *); |
40 | #include "pvrusb2-hdw-internal.h" | 40 | #include "pvrusb2-hdw-internal.h" |
41 | 41 | ||
42 | void pvr2_wm8775_update(struct pvr2_hdw *, struct v4l2_subdev *sd); | 42 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *sd); |
43 | 43 | ||
44 | 44 | ||
45 | #endif /* __PVRUSB2_WM8775_H */ | 45 | #endif /* __PVRUSB2_WM8775_H */ |