FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 01:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80887757e3
linux/drivers/media/radio
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
..
si470x [media] double mutex lock in drivers/media/radio/si470x/radio-si470x- 2011-03-21 20:31:56 -03:00
wl128x [media] fmdrv_common.c: fix compiler warning 2011-03-22 04:54:02 -03:00
dsbr100.c [media] dsbr100: ensure correct disconnect sequence 2011-03-22 16:38:09 -03:00
Kconfig [media] media/radio/wl1273: fix build errors 2011-03-21 20:32:38 -03:00
Makefile [media] drivers:media:radio: Update Kconfig and Makefile for wl128x FM driver 2011-03-21 20:32:36 -03:00
radio-aimslab.c [media] radio-aimslab.c needs #include <linux/delay.h> 2011-01-19 11:45:57 -02:00
radio-aztech.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-cadet.c [media] cadet: use unlocked_ioctl 2010-12-01 20:10:06 -02:00
radio-gemtek.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-maestro.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-maxiradio.c [media] radio-maxiradio.c: use sensible frequency range 2011-01-19 11:28:22 -02:00
radio-miropcm20.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-mr800.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
radio-rtrack2.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-sf16fmi.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-sf16fmr2.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-si4713.c [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
radio-tea5764.c [media] tea5764: convert to unlocked_ioctl 2010-12-01 20:10:07 -02:00
radio-terratec.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-timb.c mfd: mfd_cell is now implicitly available to timberdale drivers 2011-03-23 10:41:52 +01:00
radio-trust.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-typhoon.c [media] typhoon: convert to unlocked_ioctl 2010-12-01 20:10:09 -02:00
radio-wl1273.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
radio-zoltrix.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
saa7706h.c
si4713-i2c.c [media] radio-si4713: Add regulator framework support 2010-12-29 08:16:35 -02:00
si4713-i2c.h [media] radio-si4713: Add regulator framework support 2010-12-29 08:16:35 -02:00
tef6862.c V4L/DVB: v4l: remove unused i2c-id.h headers 2010-10-21 01:06:05 -02:00