Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7486): radio-cadet: wrap PNP probe code in #ifdef CONFIG_PNP
  V4L/DVB (7485): v4l2-int-device.c: add MODULE_LICENSE
  V4L/DVB (7466): Avoid minor model number warning when an OEM HVR1250 board is detected
  V4L/DVB (7465): Fix eeprom parsing and errors on the HVR1800 products
  V4L/DVB (7464): Convert driver to use a single SRAM memory map
  V4L/DVB (7461): bttv: fix missed index check
  V4L/DVB (7400): bttv: Add a radio compat_ioctl file operation
  V4L/DVB (7278): bttv: Re-enable radio tuner support for VIDIOCGFREQ/VIDIOCSFREQ ioctls
  V4L/DVB (7277): bttv: Re-enabling radio support requires the use of struct bttv_fh

...

This commit is contained in:

Linus Torvalds 2008-04-02 07:50:49 -07:00

parent d200ccce6d 044dfc99fe

commit 49115b7cb1

5 changed files with 38 additions and 141 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/media/radio/radio-cadet.c

View file

31

drivers/media/video/bt8xx/bttv-driver.c

View file

6

drivers/media/video/cx23885/cx23885-cards.c

View file

134

drivers/media/video/cx23885/cx23885-core.c

View file

2

drivers/media/video/v4l2-int-device.c

View file