aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vc04_services/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-16 16:39:06 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-16 18:30:46 +0100
commit6fde3789a2efba826d89414f8d8dcda27da9ce45 (patch)
tree1baed2b0b0d2d0f5f7955448d26d5e78469007f8 /drivers/staging/vc04_services/Kconfig
parentstaging: vc04_services: remove duplicate mutex_lock_interruptible (diff)
downloadlinux-dev-6fde3789a2efba826d89414f8d8dcda27da9ce45.tar.xz
linux-dev-6fde3789a2efba826d89414f8d8dcda27da9ce45.zip
staging: vc04_services: clarify firmware dependency
The raspberrypi-firmware driver may be built as a loadable module, which causes a link-time failure if the vc04_services driver is built-in during compile-testing: drivers/staging/vc04_services/vchiq.o: In function `vchiq_probe': vchiq_connected.c:(.text.vchiq_probe+0x2c): undefined reference to `rpi_firmware_get' drivers/staging/vc04_services/vchiq.o: In function `vchiq_platform_init': vchiq_connected.c:(.text.vchiq_platform_init+0x1f0): undefined reference to `rpi_firmware_property' This extends the dependency list to ensure the firmware is either reachable, or completely disabled in case of compile-testing. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services/Kconfig')
-rw-r--r--drivers/staging/vc04_services/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index 660dcedc2820..061ffd261086 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,6 +1,6 @@
config BCM2835_VCHIQ
tristate "Videocore VCHIQ"
- depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST
+ depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
default y
help
Kernel to VideoCore communication interface for the