diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:35:30 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:35:30 +0400 |
| commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
| tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /drivers/media/video/cx18/cx18-fileops.c | |
| parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| download | linux-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.tar.xz | |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 4d7d6d5a7f86..b3889c0b2697 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c @@ -608,7 +608,7 @@ int cx18_v4l2_close(struct file *filp) /* Mark that the radio is no longer in use */ clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags); /* Switch tuner to TV */ - cx18_call_all(cx, tuner, s_std, cx->std); + cx18_call_all(cx, core, s_std, cx->std); /* Select correct audio input (i.e. TV tuner or Line in) */ cx18_audio_set_io(cx); if (atomic_read(&cx->ana_capturing) > 0) { |