Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] msp3400: fill in v4l2_tuner based on vt->type field [media] tuner-core.c: don't change type field in g_tuner or g_frequency [media] cx18/ivtv: fix g_tuner support [media] tuner-core: power up tuner when called with s_power(1) [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK [media] tuner-core: simplify the standard fixup [media] tuner-core/v4l2-subdev: document that the type field has to be filled in [media] v4l2-subdev.h: remove unused s_mode tuner op [media] feature-removal-schedule: change in how radio device nodes are handled [media] bttv: fix s_tuner for radio [media] pvrusb2: fix g/s_tuner support [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner [media] tuner-core: fix tuner_resume: use t->mode instead of t->type [media] tuner-core: fix s_std and s_tuner
Showing
- Documentation/feature-removal-schedule.txt 22 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- drivers/media/video/bt8xx/bttv-driver.c 1 addition, 1 deletiondrivers/media/video/bt8xx/bttv-driver.c
- drivers/media/video/cx18/cx18-ioctl.c 2 additions, 6 deletionsdrivers/media/video/cx18/cx18-ioctl.c
- drivers/media/video/ivtv/ivtv-ioctl.c 2 additions, 6 deletionsdrivers/media/video/ivtv/ivtv-ioctl.c
- drivers/media/video/msp3400-driver.c 7 additions, 5 deletionsdrivers/media/video/msp3400-driver.c
- drivers/media/video/pvrusb2/pvrusb2-hdw.c 4 additions, 0 deletionsdrivers/media/video/pvrusb2/pvrusb2-hdw.c
- drivers/media/video/tuner-core.c 114 additions, 115 deletionsdrivers/media/video/tuner-core.c
- drivers/media/video/v4l2-ioctl.c 15 additions, 3 deletionsdrivers/media/video/v4l2-ioctl.c
- include/media/v4l2-subdev.h 7 additions, 3 deletionsinclude/media/v4l2-subdev.h
Loading
Please register or sign in to comment