OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b6255ee3d8
linux/include/media
History
Linus Torvalds b6255ee3d8 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 
Pull media fixes from Mauro Carvalho Chehab:
 "For a some fix patches for v3.4, including a regression fix at DVB core"

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] gspca - sonixj: Fix a zero divide in isoc interrupt
  [media] media: videobuf2-dma-contig: include header for exported symbols
  [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer
  [media] media: vb2-memops: Export vb2_get_vma symbol
  [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
  [media] s5p-fimc: Fix locking in subdev set_crop op
  [media] dvb_frontend: fix a regression with DVB-S zig-zag
  [media] fintek-cir: change || to &&
  [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal
  [media] rc: Postpone ISR registration
  [media] marvell-cam: fix an ARM build error
  [media] V4L: soc-camera: protect hosts during probing from overzealous user-space
2012-05-14 11:23:37 -07:00
..
blackfin [media] add blackfin capture bridge driver 2012-03-19 15:08:20 -03:00
davinci [media] davinci: vpif: remove machine specific header file includes 2012-02-08 10:46:54 -02:00
adp1653.h [media] adp1653: Add driver for LED flash controller 2011-07-27 17:55:39 -03:00
adv7183.h [media] adv7183: add adv7183 decoder driver 2012-03-19 15:04:10 -03:00
adv7343.h
ak881x.h
as3645a.h [media] as3645a: Add driver for LED flash controller 2011-12-20 09:36:18 -02:00
atmel-isi.h [media] atmel-isi: add code to enable/disable ISI_MCK clock 2012-01-06 11:01:11 -02:00
bt819.h
cs53l32a.h
cs5345.h
cx2341x.h
cx25840.h [media] cx25840: Add a flag to enable the CX23888 DIF to be enabled or not 2012-01-05 06:49:38 -02:00
gpio-ir-recv.h [media] gpio-ir-recv: a couple signedness bugs 2012-03-19 15:45:01 -03:00
i2c-addr.h
ir-kbd-i2c.h
lirc_dev.h
lirc.h
m5mols.h [media] m5mols: Remove superfluous irq field from the platform data struct 2011-09-24 00:23:03 -03:00
m52790.h
media-device.h device.h: audit and cleanup users in main include dir 2012-03-16 10:38:24 -04:00
media-devnode.h
media-entity.h [media] media: fix truncated entity specification 2011-12-20 09:31:50 -02:00
mmp-camera.h
msp3400.h
mt9m032.h [media] v4l: Add driver for Micron MT9M032 camera sensor 2012-03-19 18:56:33 -03:00
mt9p031.h [media] mt9p031: Aptina (Micron) MT9P031 5MP sensor driver 2011-09-11 09:49:28 -03:00
mt9t001.h [media] mt9t001: Aptina (Micron) MT9T001 3MP sensor driver 2011-09-21 15:31:08 -03:00
mt9t112.h
mt9v011.h
mt9v032.h
noon010pc30.h
omap1_camera.h
omap3isp.h [media] omap3isp: Clarify the clk_pol field in platform data 2011-12-20 09:31:00 -02:00
ov772x.h [media] V4L: ov772x: remove superfluous soc-camera client operations 2011-11-03 18:28:05 -02:00
ov7670.h
radio-si4713.h
rc-core.h [media] rc-core.h: Surround macro with do {} while (0) 2011-09-03 20:56:22 -03:00
rc-map.h [media] Add support for KWorld PC150-U ATSC hybrid tuner card 2012-03-08 11:01:25 -03:00
rj54n1cb0c.h
s5k6aa.h [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-11-03 18:29:11 -02:00
s5p_fimc.h [media] s5p-fimc: Convert to use generic media bus polarity flags 2011-09-24 00:22:31 -03:00
s5p_hdmi.h [media] v4l: s5p-tv: hdmi: add support for platform data 2012-02-28 18:26:40 -03:00
saa6588.h
saa6752hs.h
saa7115.h
saa7127.h
saa7146_vv.h
saa7146.h Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
sh_mobile_ceu.h [media] V4L: sh_mobile_ceu_camera: maximum image size depends on the hardware version 2012-03-19 22:11:06 -03:00
sh_mobile_csi2.h [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier 2011-07-27 17:56:08 -03:00
sh_vou.h
si4713.h
sii9234.h [media] v4l: s5p-tv: add sii9234 driver 2012-02-28 18:25:46 -03:00
soc_camera_platform.h [media] V4L: soc_camera_platform: remove superfluous soc-camera client operations 2011-11-03 18:28:12 -02:00
soc_camera.h [media] V4L: soc-camera: protect hosts during probing from overzealous user-space 2012-04-26 11:30:12 -03:00
soc_mediabus.h [media] V4L: soc-camera: add helper functions for new bus configuration type 2011-11-03 18:27:13 -02:00
sr030pc30.h
timb_radio.h
timb_video.h
tuner-types.h
tuner.h [media] tuner: add support for Xceive XC5000C 2012-02-14 17:20:46 -02:00
tvaudio.h
tveeprom.h
tvp514x.h
tvp5150.h
tvp7002.h
tw9910.h
upd64031a.h
upd64083.h
v4l2-chip-ident.h [media] vs6624: add vs6624 sensor driver 2012-03-19 15:04:26 -03:00
v4l2-common.h
v4l2-ctrls.h The following text was taken from the original review request: 2012-03-24 10:41:37 -07:00
v4l2-dev.h [media] v4l: Add custom compat_ioctl32 operation 2012-03-19 14:06:12 -03:00
v4l2-device.h
v4l2-event.h [media] v4l2-event.h: add overview documentation to the header 2011-07-27 17:53:34 -03:00
v4l2-fh.h [media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh 2011-07-27 17:53:31 -03:00
v4l2-int-device.h include: replace linux/module.h with "struct module" wherever possible 2011-10-31 19:32:32 -04:00
v4l2-ioctl.h The following text was taken from the original review request: 2012-03-24 10:41:37 -07:00
v4l2-mediabus.h [media] v4l2: Add polarity flag definitions for the parallel bus FIELD signal 2011-09-24 00:21:31 -03:00
v4l2-mem2mem.h
v4l2-subdev.h [media] V4L: add .g_std() core V4L2 subdevice operation 2011-11-03 18:29:02 -02:00
videobuf2-core.h [media] vb2: add vb2_get_unmapped_area in vb2 core 2011-11-03 18:29:13 -02:00
videobuf2-dma-contig.h [media] media: vb2: dma contig allocator: use dma_addr instread of paddr 2011-09-06 15:05:10 -03:00
videobuf2-dma-sg.h
videobuf2-memops.h
videobuf2-vmalloc.h
videobuf-core.h
videobuf-dma-contig.h
videobuf-dma-sg.h doc: fix broken references 2011-09-27 18:08:04 +02:00
videobuf-dvb.h
videobuf-vmalloc.h
wm8775.h