hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/staging/cx25821
History
Linus Torvalds 76d21c5635 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: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
 		2011-03-24 09:50:13 -07:00
..
Kconfig [media] staging/cx25721: serialize access to devlist 2011-03-21 20:32:41 -03:00
Makefile Staging: cx25821: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:51 -07:00
README V4L/DVB (12847): cx25821: Add README with todo list 2009-09-19 00:13:32 -03:00
cx25821-alsa.c [media] staging/cx25721: serialize access to devlist 2011-03-21 20:32:41 -03:00
cx25821-audio-upstream.c staging: cx25821: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cx25821-audio-upstream.h [media] Staging: cx25821: remove spaces after parenthesis 2010-10-21 01:17:07 -02:00
cx25821-audio.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
cx25821-biffuncs.h V4L/DVB (12733): cx25821: some CodingStyle fixes 2009-09-18 23:47:38 -03:00
cx25821-cards.c [media] drivers/staging/cx25821: Use pr_fmt and pr_<level> 2010-12-29 08:16:46 -02:00
cx25821-core.c [media] staging/cx25721: serialize access to devlist 2011-03-21 20:32:41 -03:00
cx25821-gpio.c V4L/DVB: cx25821: fix coding style issues in cx25821-gpio.c 2010-05-18 00:51:14 -03:00
cx25821-gpio.h V4L/DVB (12733): cx25821: some CodingStyle fixes 2009-09-18 23:47:38 -03:00
cx25821-i2c.c [media] drivers/staging/cx25821: Use pr_fmt and pr_<level> 2010-12-29 08:16:46 -02:00
cx25821-medusa-defines.h V4L/DVB: cx25821: Removed duplicate code and cleaned up 2010-08-02 15:18:44 -03:00
cx25821-medusa-reg.h [media] Staging: cx25821: fix braces and space coding style issues 2010-10-21 01:17:08 -02:00
cx25821-medusa-video.c [media] drivers/staging/cx25821: Use pr_fmt and pr_<level> 2010-12-29 08:16:46 -02:00
cx25821-medusa-video.h V4L/DVB: cx25821: Removed duplicate code and cleaned up 2010-08-02 15:18:44 -03:00
cx25821-reg.h [media] Staging: cx25821: fix braces and space coding style issues 2010-10-21 01:17:08 -02:00
cx25821-sram.h V4L/DVB: cx25821: Make comments C99 compliant 2010-08-02 15:18:48 -03:00
cx25821-video-upstream-ch2.c staging: cx25821: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cx25821-video-upstream-ch2.h [media] Staging: cx25821: fix braces and space coding style issues 2010-10-21 01:17:08 -02:00
cx25821-video-upstream.c staging: cx25821: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cx25821-video-upstream.h [media] Staging: cx25821: fix braces and space coding style issues 2010-10-21 01:17:08 -02:00
cx25821-video.c [media] staging/cx25721: serialize access to devlist 2011-03-21 20:32:41 -03:00
cx25821-video.h [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
cx25821.h [media] staging/cx25721: serialize access to devlist 2011-03-21 20:32:41 -03:00

README 

Todo:
	- checkpatch.pl cleanups
	- sparse cleanups

Please send patches to linux-media@vger.kernel.org