Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: rc-core: do not depend on MEDIA_SUPPORT

There is no dependency between the two, so remove the dependency in
Kconfig files.

Signed-off-by: Sean Young <sean@mess.org>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

authored by

Sean Young and committed by
Mauro Carvalho Chehab
b9e1486e f394ca21

+22 -22
+1 -1
arch/arm/configs/imx_v6_v7_defconfig
··· 226 226 CONFIG_REGULATOR_PFUZE100=y 227 227 CONFIG_MEDIA_SUPPORT=y 228 228 CONFIG_MEDIA_CAMERA_SUPPORT=y 229 - CONFIG_MEDIA_RC_SUPPORT=y 229 + CONFIG_RC_CORE=y 230 230 CONFIG_RC_DEVICES=y 231 231 CONFIG_IR_GPIO_CIR=y 232 232 CONFIG_MEDIA_USB_SUPPORT=y
+1 -1
arch/arm/configs/omap2plus_defconfig
··· 304 304 CONFIG_REGULATOR_TWL4030=y 305 305 CONFIG_MEDIA_SUPPORT=m 306 306 CONFIG_MEDIA_CAMERA_SUPPORT=y 307 - CONFIG_MEDIA_RC_SUPPORT=y 307 + CONFIG_RC_CORE=m 308 308 CONFIG_MEDIA_CONTROLLER=y 309 309 CONFIG_VIDEO_V4L2_SUBDEV_API=y 310 310 CONFIG_LIRC=m
+1 -1
arch/arm/configs/sunxi_defconfig
··· 95 95 CONFIG_REGULATOR_AXP20X=y 96 96 CONFIG_REGULATOR_GPIO=y 97 97 CONFIG_MEDIA_SUPPORT=y 98 - CONFIG_MEDIA_RC_SUPPORT=y 98 + CONFIG_RC_CORE=y 99 99 CONFIG_RC_DEVICES=y 100 100 CONFIG_IR_SUNXI=y 101 101 CONFIG_DRM=y
+1 -1
arch/mips/configs/pistachio_defconfig
··· 207 207 CONFIG_REGULATOR_FIXED_VOLTAGE=y 208 208 CONFIG_REGULATOR_GPIO=y 209 209 CONFIG_MEDIA_SUPPORT=y 210 - CONFIG_MEDIA_RC_SUPPORT=y 210 + CONFIG_RC_CORE=y 211 211 # CONFIG_RC_DECODERS is not set 212 212 CONFIG_RC_DEVICES=y 213 213 CONFIG_IR_IMG=y
+2 -15
drivers/media/Kconfig
··· 11 11 config CEC_PIN 12 12 bool 13 13 14 + source "drivers/media/rc/Kconfig" 15 + 14 16 menuconfig MEDIA_SUPPORT 15 17 tristate "Multimedia support" 16 18 depends on HAS_IOMEM ··· 76 74 Enable software defined radio support. 77 75 78 76 Say Y when you have a software defined radio device. 79 - 80 - config MEDIA_RC_SUPPORT 81 - bool "Remote Controller support" 82 - depends on INPUT 83 - ---help--- 84 - Enable support for Remote Controllers on Linux. This is 85 - needed in order to support several video capture adapters, 86 - standalone IR receivers/transmitters, and RF receivers. 87 - 88 - Enable this option if you have a video capture board even 89 - if you don't need IR, as otherwise, you may not be able to 90 - compile the driver for your adapter. 91 - 92 - Say Y when you have a TV or an IR device. 93 77 94 78 config MEDIA_CEC_SUPPORT 95 79 bool "HDMI CEC support" ··· 166 178 source "drivers/media/dvb-core/Kconfig" 167 179 168 180 comment "Media drivers" 169 - source "drivers/media/rc/Kconfig" 170 181 171 182 # 172 183 # V4L platform/mem2mem drivers
+16 -3
drivers/media/rc/Kconfig
··· 1 - config RC_CORE 2 - tristate 3 - depends on MEDIA_RC_SUPPORT 1 + 2 + menuconfig RC_CORE 3 + tristate "Remote Controller support" 4 4 depends on INPUT 5 5 default y 6 + ---help--- 7 + Enable support for Remote Controllers on Linux. This is 8 + needed in order to support several video capture adapters, 9 + standalone IR receivers/transmitters, and RF receivers. 6 10 11 + Enable this option if you have a video capture board even 12 + if you don't need IR, as otherwise, you may not be able to 13 + compile the driver for your adapter. 14 + 15 + Say Y when you have a TV or an IR device. 16 + 17 + if RC_CORE 7 18 source "drivers/media/rc/keymaps/Kconfig" 8 19 9 20 menuconfig RC_DECODERS ··· 447 436 be called sir-ir. 448 437 449 438 endif #RC_DEVICES 439 + 440 + endif #RC_CORE