Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (44 commits)
  V4L/DVB (5571): V4l1-compat:  Make VIDIOCSPICT return errors in a useful way
  V4L/DVB (5624): Radio-maestro.c cleanup
  V4L/DVB (5623): Dsbr100.c Replace usb_dsbr100_do_ioctl to use video_ioctl2
  V4L/DVB (5622): Radio-zoltrix.c cleanup
  V4L/DVB (5621): Radio-cadet.c Replace cadet_do_ioctl to use video_ioctl2
  V4L/DVB (5619): Dvb-usb: fix typo
  V4L/DVB (5618): Cx88: Drop the generic i2c client from cx88-vp3054-i2c
  V4L/DVB (5617): V4L2: videodev, allow debugging
  V4L/DVB (5614): M920x: Disable second adapter on LifeView TV Walker Twin
  V4L/DVB (5613): M920x: loosen up 80-col limit
  V4L/DVB (5612): M920x: rename function prefixes from m9206_foo to m920x_foo
  V4L/DVB (5611): M920x: replace deb_rc with deb
  V4L/DVB (5610): M920x: remove duplicated code
  V4L/DVB (5609): M920x: group like functions together
  V4L/DVB (5608): M920x: various whitespace cleanups
  V4L/DVB (5607): M920x: Initial support for devices likely manufactured by Dposh
  V4L/DVB (5606): M920x: add "c-basic-offset: 8" to help emacs to enforce tabbing
  V4L/DVB (5605): M920x: Add support for LifeView TV Walker Twin
  V4L/DVB (5603): V4L: Prevent queueing queued buffers.
  V4L/DVB (5602): Enable DiSEqC in Starbox II (vp7021a)
  ...

diff --combined drivers/media/Kconfig
index 3a80e0cc73699e9e24bcc6fb4382fab9cb5a9dec,a852799f7bdb38f411a9524a507206274f0716c5..624b21cef5b398617a543e69f48307169788f18b
--- 1/drivers/media/Kconfig
--- 2/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@@ -3,7 -3,6 +3,7 @@@
  #
  
  menu "Multimedia devices"
 +      depends on HAS_IOMEM
  
  config VIDEO_DEV
        tristate "Video For Linux"
@@@ -87,6 -86,14 +87,14 @@@ config VIDEO_TVEEPRO
        tristate
        depends on I2C
  
+ config DAB
+       boolean "DAB adapters"
+       default y
+       ---help---
+         Allow selecting support for for Digital Audio Broadcasting (DAB)
+         Receiver adapters.
+ 
+ if DAB
  config USB_DABUSB
        tristate "DABUSB driver"
        depends on USB
@@@ -100,5 -107,6 +108,6 @@@
  
          To compile this driver as a module, choose M here: the
          module will be called dabusb.
+ endif # DAB
  
  endmenu