aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-19 05:10:12 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-28 20:16:16 -0300
commitcd70c37b5a23eee7aa411205e2b4c74097f52336 (patch)
treef2ca3905c9f98e132ec904281adbabbd387f620a /drivers/staging
parent[media] vivid: don't handle CEC_MSG_SET_STREAM_PATH (diff)
downloadlinux-dev-cd70c37b5a23eee7aa411205e2b4c74097f52336.tar.xz
linux-dev-cd70c37b5a23eee7aa411205e2b4c74097f52336.zip
[media] staging: add MEDIA_SUPPORT dependency
staging media drivers tend to have a build time dependency on the media support. In particular, the newly added pulse8 cec driver can only be a loadable module if MEDIA_SUPPORT=m, but its build dependency is on a 'bool' symbol (MEDIA_CEC), so a randconfig build can fail with pulse8_cec built-in: drivers/staging/built-in.o: In function `pulse8_disconnect': dgnc_utils.c:(.text+0x114): undefined reference to `cec_unregister_adapter' drivers/staging/built-in.o: In function `pulse8_irq_work_handler': dgnc_utils.c:(.text+0x1bc): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x1d8): undefined reference to `cec_received_msg' dgnc_utils.c:(.text+0x1f4): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x218): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x23c): undefined reference to `cec_transmit_done' drivers/staging/built-in.o: In function `pulse8_connect': dgnc_utils.c:(.text+0x844): undefined reference to `cec_allocate_adapter' dgnc_utils.c:(.text+0x8a4): undefined reference to `cec_delete_adapter' dgnc_utils.c:(.text+0xa10): undefined reference to `cec_register_adapter' Originally, MEDIA_CEC itself was a tristate symbol, which would have prevented this, but since 5bb2399a4fe4 ("[media] cec: fix Kconfig dependency problems"), it doesn't work like that any more. This encloses all of the staging media drivers in a CONFIG_MEDIA_SUPPORT dependency in Kconfig, which solves the problem by enforcing that none of the drivers can be built-in if the media core is a module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index cae42e56f270..7292f23954df 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -16,7 +16,7 @@ menuconfig STAGING_MEDIA
If in doubt, say N here.
-if STAGING_MEDIA
+if STAGING_MEDIA && MEDIA_SUPPORT
# Please keep them in alphabetic order
source "drivers/staging/media/bcm2048/Kconfig"