Merge branch 'patches_for_v3.6' into v4l_for_linus

* patches_for_v3.6: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

1 files changed, 27 insertions, 22 deletions

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index f97eeb870455..908ef70430e9 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -1,21 +1,20 @@
-menuconfig RC_CORE
-        tristate "Remote Controller adapters"
+config RC_CORE
+        tristate
+        depends on MEDIA_RC_SUPPORT
         depends on INPUT
-        default INPUT
-        ---help---
-          Enable support for Remote Controllers on Linux. This is
-          needed in order to support several video capture adapters,
-          standalone IR receivers/transmitters, and RF receivers.
+        default y
 
-          Enable this option if you have a video capture board even
-          if you don't need IR, as otherwise, you may not be able to
-          compile the driver for your adapter.
+source "drivers/media/rc/keymaps/Kconfig"
 
-if RC_CORE
+menuconfig RC_DECODERS
+        bool "Remote controller decoders"
+        depends on RC_CORE
+        default y
 
+if RC_DECODERS
 config LIRC
-        tristate
-        default y
+        tristate "LIRC interface driver"
+        depends on RC_CORE
 
         ---help---
            Enable this option to build the Linux Infrared Remote
@@ -24,7 +23,16 @@ config LIRC
            LIRC daemon handles protocol decoding for IR reception and
            encoding for IR transmitting (aka "blasting").
 
-source "drivers/media/rc/keymaps/Kconfig"
+config IR_LIRC_CODEC
+        tristate "Enable IR to LIRC bridge"
+        depends on RC_CORE
+        depends on LIRC
+        default y
+
+        ---help---
+           Enable this option to pass raw IR to and from userspace via
+           the LIRC interface.
+
 
 config IR_NEC_DECODER
         tristate "Enable IR raw decoder for the NEC protocol"
@@ -108,16 +116,13 @@ config IR_MCE_KBD_DECODER
            Enable this option if you have a Microsoft Remote Keyboard for
            Windows Media Center Edition, which you would like to use with
            a raw IR receiver in your system.
+endif #RC_DECODERS
 
-config IR_LIRC_CODEC
-        tristate "Enable IR to LIRC bridge"
+menuconfig RC_DEVICES
+        bool "Remote Controller devices"
         depends on RC_CORE
-        depends on LIRC
-        default y
 
-        ---help---
-           Enable this option to pass raw IR to and from userspace via
-           the LIRC interface.
+if RC_DEVICES
 
 config RC_ATI_REMOTE
         tristate "ATI / X10 based USB RF remote controls"
@@ -276,4 +281,4 @@ config IR_GPIO_CIR
            To compile this driver as a module, choose M here: the module will
            be called gpio-ir-recv.
 
-endif #RC_CORE
+endif #RC_DEVICES