diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-24 10:11:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-24 10:11:23 +0200 |
| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e (patch) | |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a /drivers/media/video/vp27smpx.c | |
| parent | 56449f437add737a1e5e1cb7e00f63ac8ead1938 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/vp27smpx.c')
| -rw-r--r-- | drivers/media/video/vp27smpx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c index 42e23a4fa60..38e53b303cc 100644 --- a/drivers/media/video/vp27smpx.c +++ b/drivers/media/video/vp27smpx.c @@ -134,11 +134,11 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd) static const struct v4l2_subdev_core_ops vp27smpx_core_ops = { .log_status = vp27smpx_log_status, .g_chip_ident = vp27smpx_g_chip_ident, + .s_std = vp27smpx_s_std, }; static const struct v4l2_subdev_tuner_ops vp27smpx_tuner_ops = { .s_radio = vp27smpx_s_radio, - .s_std = vp27smpx_s_std, .s_tuner = vp27smpx_s_tuner, .g_tuner = vp27smpx_g_tuner, }; |