diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 07:58:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 07:58:25 -0700 |
| commit | 1046a2c428bedd64c960dcfd0c57cc69a82fea2f (patch) | |
| tree | d34b83e0ac61b51305cece031f7ff49579e3fe76 /drivers/staging | |
| parent | 46e85f5f1c2a1d106c1ec0fa2a06280276b8e052 (diff) | |
| parent | b3f4e1eba45eda5d1213810ef3bc53e5247df2df (diff) | |
| download | linux-1046a2c428bedd64c960dcfd0c57cc69a82fea2f.tar.gz linux-1046a2c428bedd64c960dcfd0c57cc69a82fea2f.tar.bz2 linux-1046a2c428bedd64c960dcfd0c57cc69a82fea2f.zip | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
[media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
[media] it913x [VER 1.07] Support for single ITE 9135 devices
[media] Support for Terratec G1
[media] cx25821: off by one in cx25821_vidioc_s_input()
[media] media: tea5764: reconcile Kconfig symbol and macro
[media] omap_vout: Add poll() support
[media] omap3isp: preview: Add crop support on the sink pad
[media] omap3isp: preview: Rename min/max input/output sizes defines
[media] omap3isp: preview: Remove horizontal averager support
[media] omap3isp: Report the ISP revision through the media controller API
[media] omap3isp: ccdc: remove redundant operation
[media] omap3isp: Fix memory leaks in initialization error paths
[media] omap3isp: Add missing mutex_destroy() calls
[media] omap3isp: Move *_init_entities() functions to the init/cleanup section
[media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
[media] MFC: Change MFC firmware binary name
[media] vb2: add vb2_get_unmapped_area in vb2 core
[media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
[media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
[media] media: ov6650: stylistic improvements
...
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 8 | ||||
| -rw-r--r-- | drivers/staging/cx25821/Kconfig | 34 | ||||
| -rw-r--r-- | drivers/staging/cx25821/Makefile | 13 | ||||
| -rw-r--r-- | drivers/staging/cx25821/README | 6 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-alsa.c | 795 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-audio-upstream.c | 788 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-audio-upstream.h | 62 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-audio.h | 61 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-biffuncs.h | 45 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-cards.c | 72 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-core.c | 1517 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-gpio.c | 98 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-i2c.c | 425 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-medusa-defines.h | 42 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-medusa-reg.h | 455 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-medusa-video.c | 872 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-medusa-video.h | 49 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-reg.h | 1592 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-sram.h | 261 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream-ch2.c | 823 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream-ch2.h | 138 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream.c | 885 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video-upstream.h | 139 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video.c | 2012 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821-video.h | 188 | ||||
| -rw-r--r-- | drivers/staging/cx25821/cx25821.h | 616 | ||||
| -rw-r--r-- | drivers/staging/media/Kconfig | 37 | ||||
| -rw-r--r-- | drivers/staging/media/Makefile | 7 | ||||
| -rw-r--r-- | drivers/staging/media/as102/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/media/as102/Makefile | 6 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_drv.c | 351 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_drv.h | 141 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_fe.c | 603 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_fw.c | 251 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_fw.h | 42 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_usb_drv.c | 478 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as102_usb_drv.h | 59 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_cmd.c | 452 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_cmd.h | 540 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_cmd_cfg.c | 215 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_cmd_stream.c | 223 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_handle.h | 58 | ||||
| -rw-r--r-- | drivers/staging/media/as102/as10x_types.h | 198 | ||||
| -rw-r--r-- | drivers/staging/media/cxd2099/Kconfig (renamed from drivers/staging/cxd2099/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/cxd2099/Makefile (renamed from drivers/staging/cxd2099/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/cxd2099/TODO (renamed from drivers/staging/cxd2099/TODO) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/cxd2099/cxd2099.c (renamed from drivers/staging/cxd2099/cxd2099.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/cxd2099/cxd2099.h (renamed from drivers/staging/cxd2099/cxd2099.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/dt3155v4l/Kconfig (renamed from drivers/staging/dt3155v4l/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/dt3155v4l/Makefile (renamed from drivers/staging/dt3155v4l/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c (renamed from drivers/staging/dt3155v4l/dt3155v4l.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.h (renamed from drivers/staging/dt3155v4l/dt3155v4l.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/Kconfig (renamed from drivers/staging/easycap/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/Makefile (renamed from drivers/staging/easycap/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/README (renamed from drivers/staging/easycap/README) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap.h (renamed from drivers/staging/easycap/easycap.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_ioctl.c (renamed from drivers/staging/easycap/easycap_ioctl.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_low.c (renamed from drivers/staging/easycap/easycap_low.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_main.c (renamed from drivers/staging/easycap/easycap_main.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_settings.c (renamed from drivers/staging/easycap/easycap_settings.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_sound.c (renamed from drivers/staging/easycap/easycap_sound.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/easycap/easycap_testcard.c (renamed from drivers/staging/easycap/easycap_testcard.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/Kconfig (renamed from drivers/staging/go7007/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/Makefile (renamed from drivers/staging/go7007/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/README (renamed from drivers/staging/go7007/README) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-driver.c (renamed from drivers/staging/go7007/go7007-driver.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-fw.c (renamed from drivers/staging/go7007/go7007-fw.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-i2c.c (renamed from drivers/staging/go7007/go7007-i2c.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-priv.h (renamed from drivers/staging/go7007/go7007-priv.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-usb.c (renamed from drivers/staging/go7007/go7007-usb.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c (renamed from drivers/staging/go7007/go7007-v4l2.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007.h (renamed from drivers/staging/go7007/go7007.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007.txt (renamed from drivers/staging/go7007/go7007.txt) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/s2250-board.c (renamed from drivers/staging/go7007/s2250-board.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/s2250-loader.c (renamed from drivers/staging/go7007/s2250-loader.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/s2250-loader.h (renamed from drivers/staging/go7007/s2250-loader.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/saa7134-go7007.c (renamed from drivers/staging/go7007/saa7134-go7007.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/snd-go7007.c (renamed from drivers/staging/go7007/snd-go7007.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-i2c.h (renamed from drivers/staging/go7007/wis-i2c.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-ov7640.c (renamed from drivers/staging/go7007/wis-ov7640.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-saa7113.c (renamed from drivers/staging/go7007/wis-saa7113.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-saa7115.c (renamed from drivers/staging/go7007/wis-saa7115.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-sony-tuner.c (renamed from drivers/staging/go7007/wis-sony-tuner.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-tw2804.c (renamed from drivers/staging/go7007/wis-tw2804.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-tw9903.c (renamed from drivers/staging/go7007/wis-tw9903.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-uda1342.c (renamed from drivers/staging/go7007/wis-uda1342.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/Kconfig (renamed from drivers/staging/lirc/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/Makefile (renamed from drivers/staging/lirc/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/TODO (renamed from drivers/staging/lirc/TODO) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/TODO.lirc_zilog (renamed from drivers/staging/lirc/TODO.lirc_zilog) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_bt829.c (renamed from drivers/staging/lirc/lirc_bt829.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_ene0100.h (renamed from drivers/staging/lirc/lirc_ene0100.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_igorplugusb.c (renamed from drivers/staging/lirc/lirc_igorplugusb.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c (renamed from drivers/staging/lirc/lirc_imon.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.c (renamed from drivers/staging/lirc/lirc_parallel.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.h (renamed from drivers/staging/lirc/lirc_parallel.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_sasem.c (renamed from drivers/staging/lirc/lirc_sasem.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c (renamed from drivers/staging/lirc/lirc_serial.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_sir.c (renamed from drivers/staging/lirc/lirc_sir.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_ttusbir.c (renamed from drivers/staging/lirc/lirc_ttusbir.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_zilog.c (renamed from drivers/staging/lirc/lirc_zilog.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/Kconfig (renamed from drivers/staging/solo6x10/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/Makefile (renamed from drivers/staging/solo6x10/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/TODO (renamed from drivers/staging/solo6x10/TODO) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/core.c (renamed from drivers/staging/solo6x10/core.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/disp.c (renamed from drivers/staging/solo6x10/disp.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/enc.c (renamed from drivers/staging/solo6x10/enc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/g723.c (renamed from drivers/staging/solo6x10/g723.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/gpio.c (renamed from drivers/staging/solo6x10/gpio.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/i2c.c (renamed from drivers/staging/solo6x10/i2c.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/jpeg.h (renamed from drivers/staging/solo6x10/jpeg.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/offsets.h (renamed from drivers/staging/solo6x10/offsets.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/osd-font.h (renamed from drivers/staging/solo6x10/osd-font.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/p2m.c (renamed from drivers/staging/solo6x10/p2m.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/registers.h (renamed from drivers/staging/solo6x10/registers.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/solo6x10.h (renamed from drivers/staging/solo6x10/solo6x10.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/solo6x10/tw28.c (renamed from drivers/staging/solo6x10/tw28.c) | 0 |