diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-03-20 10:35:28 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-21 08:36:35 +0100 |
commit | ce95e3a9c59916d248df0a1a80494969777565df (patch) | |
tree | 5b8297f0950ebd9b3251e19b4ac211ea32e773e5 | |
parent | 35060a228e70c712cb626ef3eabaedc40903eb77 (diff) | |
download | linux-ce95e3a9c59916d248df0a1a80494969777565df.tar.bz2 |
staging: vc04_services: make BCM_VIDEOCORE tristate
Adding the 'bool' symbol brought back a randconfig build bug that
I had fixed before:
drivers/staging/built-in.o: In function `vchiq_probe':
(.text+0x1da30): undefined reference to `rpi_firmware_get'
drivers/staging/built-in.o: In function `vchiq_platform_init':
(.text+0x27494): undefined reference to `rpi_firmware_property'
The problem is that when RASPBERRYPI_FIRMWARE is a loadable module,
but BCM2835_VCHIQ can again be built-in. Making BCM_VIDEOCORE
itself tristate will make Kconfig honor the dependency correctly.
Fixes: 6bbfe4a76158 ("staging: vc04_services: Create new BCM_VIDEOCORE setting for VideoCore services.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vc04_services/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index b9f316603308..136baeaea57d 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -1,5 +1,5 @@ menuconfig BCM_VIDEOCORE - bool "Broadcom VideoCore support" + tristate "Broadcom VideoCore support" depends on HAS_DMA depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE) default y |