Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
4547668a05
linux/drivers/media/video/cx18
History
Linus Torvalds 3e74683137 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h
2009-12-09 19:50:49 -08:00
..
cx18-audio.c V4L/DVB (11624): cx18: Toggle the AI1 mux when changing the CX18_AUDIO_ENABLE register 2009-06-16 18:20:45 -03:00
cx18-audio.h V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices 2009-03-30 12:43:01 -03:00
cx18-av-audio.c V4L/DVB (11310): cx18: remove intermediate 'ioctl' step 2009-03-30 12:43:49 -03:00
cx18-av-core.c V4L/DVB (13478): cx18: remove bogus init call. 2009-12-05 18:42:05 -02:00
cx18-av-core.h tree-wide: fix misspelling of "definition" in comments 2009-12-04 23:41:47 +01:00
cx18-av-firmware.c V4L/DVB (11624): cx18: Toggle the AI1 mux when changing the CX18_AUDIO_ENABLE register 2009-06-16 18:20:45 -03:00
cx18-av-vbi.c V4L/DVB (11864): cx18: Complete support for Sliced and Raw VBI for 625 line systems 2009-06-16 18:21:14 -03:00
cx18-cards.c V4L/DVB (12367): cx18: Add i2c initialization for Z8F0811/Hauppage IR transceivers 2009-09-12 12:18:25 -03:00
cx18-cards.h V4L/DVB (13445): cx18: Use per cx18 instance init data for ir-kbd-i2c instead of const data 2009-12-05 18:41:57 -02:00
cx18-controls.c V4L/DVB (12338): cx18: Read buffer overflow 2009-08-13 20:39:02 -03:00
cx18-controls.h V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl 2008-07-20 07:12:23 -03:00
cx18-driver.c V4L/DVB (13478): cx18: remove bogus init call. 2009-12-05 18:42:05 -02:00
cx18-driver.h V4L/DVB (13445): cx18: Use per cx18 instance init data for ir-kbd-i2c instead of const data 2009-12-05 18:41:57 -02:00
cx18-dvb.c V4L/DVB (13430): cx18: Fix YUV capture so that encoder passes a single frame per transfer 2009-12-05 18:41:52 -02:00
cx18-dvb.h V4L/DVB (9720): cx18: Major rewrite of interrupt handling for incoming mailbox processing 2008-12-30 09:38:07 -02:00
cx18-fileops.c V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-fileops.h V4L/DVB (10135): v4l2: introduce v4l2_file_operations. 2009-01-02 17:11:12 -02:00
cx18-firmware.c V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev 2009-03-30 12:43:01 -03:00
cx18-firmware.h
cx18-gpio.c V4L/DVB (11380): v4l2-subdev: change s_routing prototype 2009-04-06 21:44:27 -03:00
cx18-gpio.h V4L/DVB (10759): cx18: Convert GPIO connected functions to act as v4l2_subdevices 2009-03-30 12:43:01 -03:00
cx18-i2c.c V4L/DVB (13445): cx18: Use per cx18 instance init data for ir-kbd-i2c instead of const data 2009-12-05 18:41:57 -02:00
cx18-i2c.h V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices 2009-03-30 12:43:01 -03:00
cx18-io.c V4L/DVB (9727): cx18: Adjust outgoing mailbox timeouts and remove statistics logging 2008-12-30 09:38:11 -02:00
cx18-io.h V4L/DVB (9778): cx18: cx18_writel_expect() should not declare success on a PCI read error 2008-12-30 09:38:20 -02:00
cx18-ioctl.c V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-ioctl.h V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl. 2009-01-02 17:11:34 -02:00
cx18-irq.c V4L/DVB (9728): cx18: Copyright attribution update for files modified by awalls 2008-12-30 09:38:11 -02:00
cx18-irq.h V4L/DVB (9728): cx18: Copyright attribution update for files modified by awalls 2008-12-30 09:38:11 -02:00
cx18-mailbox.c V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-mailbox.h Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
cx18-queue.c V4L/DVB (13433): cx18: Remove duplicate list traversal when processing incoming MDLs 2009-12-05 18:41:53 -02:00
cx18-queue.h V4L/DVB (13433): cx18: Remove duplicate list traversal when processing incoming MDLs 2009-12-05 18:41:53 -02:00
cx18-scb.c V4L/DVB (9895): cx18: Refine the firmware load and firmware startup process 2008-12-30 09:39:09 -02:00
cx18-scb.h V4L/DVB (13426): cx18: Rename struct cx18_mdl to struct cx18_mdl_ent 2009-12-05 18:41:50 -02:00
cx18-streams.c V4L/DVB (13432): cx18: Adjust encoder VBI MDL size to be exactly frame's worth of VBI data 2009-12-05 18:41:53 -02:00
cx18-streams.h V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-vbi.c V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-vbi.h V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-version.h V4L/DVB (13434): cx18: Bump version number due to significant buffer handling changes. 2009-12-05 18:41:54 -02:00
cx18-video.c V4L/DVB (11380): v4l2-subdev: change s_routing prototype 2009-04-06 21:44:27 -03:00
cx18-video.h
cx23418.h V4L/DVB (13426): cx18: Rename struct cx18_mdl to struct cx18_mdl_ent 2009-12-05 18:41:50 -02:00
Kconfig V4L/DVB (11127): Kconfig: replace all occurrences of CUSTOMIZE to CUSTOMISE 2009-03-30 12:43:31 -03:00
Makefile V4L/DVB (8913): cx18: Create cx18_ specific wrappers for all pci mmio accessesors. 2008-10-12 09:36:58 -02:00