openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/video
History
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
 		2011-11-06 19:44:47 -08:00
..
au0828 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
bt8xx [media] bt8xx: Use current logging styles 2011-09-03 21:02:52 -03:00
cpia2 drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
cx18 [media] cx18: Fix FM radio 2011-11-03 07:42:21 -02:00
cx88 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
cx231xx [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
cx23885 [media] cx23885: Stop the risc video fifo before reconfiguring it 2011-10-14 17:23:20 -03:00
cx25821 [media] cx25821: off by one in cx25821_vidioc_s_input() 2011-11-03 18:33:55 -02:00
cx25840 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
davinci 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
em28xx [media] Support for Terratec G1 2011-11-03 18:33:57 -02:00
et61x251 [media] et61x251: Use current logging styles 2011-09-03 21:11:59 -03:00
gspca [media] gspca - main: Display the subdriver name and version at probe time 2011-09-23 23:31:52 -03:00
hdpvr 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
ivtv [media] ivtv: Fix radio support 2011-11-03 07:42:15 -02:00
m5mols 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
marvell-ccic [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
omap [media] omap_vout: Add poll() support 2011-11-03 18:33:53 -02:00
omap3isp [media] omap3isp: preview: Add crop support on the sink pad 2011-11-03 18:33:52 -02:00
pvrusb2 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
pwc [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
s5p-fimc [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
s5p-mfc [media] MFC: Change MFC firmware binary name 2011-11-03 18:29:14 -02:00
s5p-tv [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
saa7134 [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set 2011-11-03 18:33:59 -02:00
saa7164 [media] saa7164: Adding support for HVR2200 card id 0x8953 2011-09-21 10:16:31 -03:00
sn9c102 [media] return -ENOTTY for unsupported ioctl's at legacy drivers 2011-07-27 17:53:38 -03:00
tlg2300 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
tm6000 [media] move tm6000 to drivers/media/video 2011-09-23 09:32:35 -03:00
usbvision 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
uvc Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
zoran [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
Kconfig [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-11-03 18:29:11 -02:00
Makefile [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-11-03 18:29:11 -02:00
adp1653.c 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
adv7170.c V4L/DVB: adv7170: remove obsolete v4l2-i2c-drv.h header 2010-10-21 01:06:04 -02:00
adv7175.c [media] adv7175: Make use of media bus pixel codes 2011-10-19 07:59:05 -02:00
adv7180.c V4L/DVB: v4l: remove unused i2c-id.h headers 2010-10-21 01:06:05 -02:00
adv7343.c [media] adv7343: use control framework 2011-03-21 20:31:49 -03:00
adv7343_regs.h [media] adv7343: use control framework 2011-03-21 20:31:49 -03:00
ak881x.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
arv.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
atmel-isi.c [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
bt819.c [media] vpx3220, bt819: fix compiler warnings 2011-09-06 14:46:17 -03:00
bt856.c V4L/DVB: bt856: remove obsolete v4l2-i2c-drv.h header 2010-10-21 01:06:02 -02:00
bt866.c
…
btcx-risc.c
…
btcx-risc.h
…
bw-qcam.c [media] drivers/media/video: add missing kfree 2011-07-27 17:55:55 -03:00
c-qcam.c [media] drivers/media/video: add missing kfree 2011-07-27 17:55:55 -03:00
cs53l32a.c V4L/DVB: cs53l32a: remove obsolete v4l2-i2c-drv.h header 2010-10-21 01:06:03 -02:00
cs5345.c [media] cs5345: use the control framework 2011-03-21 20:31:49 -03:00
cs8420.h
…
cx2341x.c [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02:00
fsl-viu.c [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
hexium_gemini.c 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
hexium_orion.c 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
ibmmpeg2.h
…
imx074.c 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
indycam.c
…
indycam.h
…
ir-kbd-i2c.c [media] ir-kbd-i2c: pass device code w/key in hauppauge case 2011-03-22 19:24:18 -03:00
ks0127.c V4L/DVB: ks0127: remove obsolete v4l2_i2c_drv.h header 2010-10-21 01:06:04 -02:00
ks0127.h
…
m52790.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
mem2mem_testdev.c [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
meye.c [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
meye.h
…
msp3400-driver.c [media] msp3400: Add standards detection to the driver 2011-10-08 08:01:34 -03:00
msp3400-driver.h [media] msp3400: Add standards detection to the driver 2011-10-08 08:01:34 -03:00
msp3400-kthreads.c [media] msp3400: Add standards detection to the driver 2011-10-08 08:01:34 -03:00
mt9m001.c 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
mt9m111.c 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
mt9p031.c [media] drivers/media: fix dependencies in video mt9t001/mt9p031 2011-10-08 08:01:46 -03:00
mt9t001.c [media] drivers/media: fix dependencies in video mt9t001/mt9p031 2011-10-08 08:01:46 -03:00
mt9t031.c 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
mt9t112.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
mt9v011.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
mt9v022.c 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
mt9v032.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
mx1_camera.c [media] V4L: mx1_camera: convert to the new mbus-config subdev operations 2011-11-03 18:27:43 -02:00
mx2_camera.c [media] V4L: mx2_camera: convert to the new mbus-config subdev operations 2011-11-03 18:27:44 -02:00
mx3_camera.c [media] V4L: mx3-camera: prepare to support multi-size buffers 2011-11-03 18:28:39 -02:00
mxb.c 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
mxb.h
…
noon010pc30.c 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
omap1_camera.c [media] V4L: omap1-camera: fix Oops with NULL platform data 2011-11-03 18:28:22 -02:00
omap24xxcam-dma.c
…
omap24xxcam.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
omap24xxcam.h
…
ov772x.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
ov2640.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
ov5642.c [media] media: ov5642: Add support for arbitrary resolution 2011-11-03 18:29:05 -02:00
ov6650.c 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
ov7670.c [media] marvell-cam: Move cafe-ccic into its own directory 2011-07-27 17:53:00 -03:00
ov9640.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
ov9640.h [media] ov9640: convert to the control framework 2011-11-03 18:28:36 -02:00
ov9740.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
pms.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
pxa_camera.c [media] V4L: pxa_camera: convert to the new mbus-config subdev operations 2011-11-03 18:27:50 -02:00
rj54n1cb0c.c 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
s5k6aa.c [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-11-03 18:29:11 -02:00
s2255drv.c [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
saa711x_regs.h
…
saa717x.c
…
saa6588.c [media] saa6588: rename rds.h to saa6588.h 2010-12-29 08:17:18 -02:00
saa7110.c [media] saa7110: use control framework 2011-03-21 20:31:50 -03:00
saa7115.c [media] saa7115: Trust that V4L2 core will fill the mask 2011-10-08 08:00:44 -03:00
saa7121.h
…
saa7127.c V4L/DVB: saa7127: remove obsolete v4l2-i2c-drv.h header 2010-10-21 01:06:04 -02:00
saa7146.h
…
saa7146reg.h
…
saa7185.c
…
saa7191.c
…
saa7191.h
…
sh_mobile_ceu_camera.c [media] V4L: sh_mobile_ceu_camera: the host shall configure the pipeline 2011-11-03 18:28:42 -02:00
sh_mobile_csi2.c 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_vou.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
soc_camera.c [media] V4L: soc-camera: make (almost) all client drivers re-usable outside of the framework 2011-11-03 18:29:03 -02:00
soc_camera_platform.c [media] soc_camera: remove the now obsolete struct soc_camera_ops 2011-11-03 18:28:55 -02:00
soc_mediabus.c [media] V4L: soc-camera: add helper functions for new bus configuration type 2011-11-03 18:27:13 -02:00
sr030pc30.c 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
stk-sensor.c
…
stk-webcam.c [media] stk-webcam.c: webcam LED bug fix 2011-09-23 23:07:59 -03:00
stk-webcam.h
…
tcm825x.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
tcm825x.h
…
tda7432.c [media] Correct and add some parameter descriptions 2011-07-27 17:52:59 -03:00
tda9840.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
tea6415c.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
tea6415c.h
…
tea6420.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
tea6420.h
…
ths7303.c
…
timblogiw.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
tlv320aic23b.c [media] tlv320aic23b: use control framework 2011-03-21 20:31:50 -03:00
tuner-core.c [media] xc4000: removed card_type 2011-07-27 17:52:40 -03:00
tvaudio.c [media] tvaudio: fix compiler warnings 2011-09-06 14:44:30 -03:00
tveeprom.c [media] tveeprom: update hauppauge tuner list thru 174 2011-05-20 09:27:15 -03:00
tvp514x.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
tvp514x_regs.h
…
tvp5150.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
tvp5150_reg.h [media] tvp5150: Add video format registers configuration values 2011-10-08 08:01:52 -03:00
tvp7002.c 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
tvp7002_reg.h
…
tw9910.c [media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 2011-11-03 18:29:04 -02:00
upd64031a.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
upd64083.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
v4l2-common.c [media] v4l2-ctrls: add new bitmask control type 2011-07-27 17:55:38 -03:00
v4l2-compat-ioctl32.c [media] V4L: docbook documentation for struct v4l2_create_buffers 2011-11-03 18:28:57 -02:00
v4l2-ctrls.c 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
v4l2-dev.c [media] videodev: fix a NULL pointer dereference in v4l2_device_release() 2011-10-19 09:48:08 -02:00
v4l2-device.c 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
v4l2-event.c drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:31:51 -04:00
v4l2-fh.c drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:31:51 -04:00
v4l2-int-device.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
v4l2-ioctl.c [media] V4L: add two new ioctl()s for multi-size videobuffer management 2011-11-03 18:28:24 -02:00
v4l2-mem2mem.c [media] media: mem2mem: eliminate possible NULL pointer dereference 2011-09-06 15:03:26 -03:00
v4l2-subdev.c 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
via-camera.c Merge branch 'pm-qos' into pm-for-linus 2011-10-07 23:17:07 +02:00
via-camera.h [media] Add the via framebuffer camera controller driver 2010-10-21 13:45:28 -02:00
videobuf-core.c [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
videobuf-dma-contig.c Revert "[media] V4L: videobuf, don't use dma addr as physical" 2011-04-19 10:54:44 -07:00
videobuf-dma-sg.c [media] videobuf_pages_to_sg: sglist[0] length problem 2011-07-27 17:52:19 -03:00
videobuf-dvb.c V4L/DVB: videobuf: add queue argument to videobuf_waiton() 2010-10-21 01:06:14 -02:00
videobuf-vmalloc.c V4L/DVB: videobuf: add ext_lock argument to the queue init functions 2010-10-21 01:06:14 -02:00
videobuf2-core.c [media] vb2: add vb2_get_unmapped_area in vb2 core 2011-11-03 18:29:13 -02:00
videobuf2-dma-contig.c [media] media: vb2: dma contig allocator: use dma_addr instread of paddr 2011-09-06 15:05:10 -03:00
videobuf2-dma-sg.c [media] videobuf2: Do not unconditionally map S/G buffers into kernel space 2011-09-03 10:57:33 -03:00
videobuf2-memops.c [media] media: vb2: fix userptr VMA release seq 2011-09-06 15:05:21 -03:00
videobuf2-vmalloc.c [media] Update Pawel Osciak's e-mail address 2011-03-22 04:55:05 -03:00
vino.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
vino.h
…
vivi.c [media] V4L: vb2: prepare to support multi-size buffers 2011-11-03 18:28:28 -02:00
vp27smpx.c
…
vpx3220.c [media] vpx3220, bt819: fix compiler warnings 2011-09-06 14:46:17 -03:00
w9966.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
wm8739.c
…
wm8775.c [media] Add proper audio support for Nova-S Plus with wm8775 ADC 2011-03-21 20:32:19 -03:00
zr364xx.c [media] drivers/media/video/zr364xx.c: add missing cleanup code 2011-09-03 18:43:58 -03:00