diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
| commit | 1c816bad41fea5470e8077ae4e661f3f9b5ada64 (patch) | |
| tree | 5e923d12b6284a711d66efee822ca48f95ebf1af /drivers/staging/vc04_services | |
| parent | b0fe8f7b9b5adea2c85c72bba46e20fb21522769 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-stable-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.gz linux-stable-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.bz2 linux-stable-1c816bad41fea5470e8077ae4e661f3f9b5ada64.zip | |
Merge 4.11-rc4 into staging-next
We need the IIO fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
| -rw-r--r-- | drivers/staging/vc04_services/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index 136baeaea57d..9e2763663ab8 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -1,6 +1,7 @@ menuconfig BCM_VIDEOCORE tristate "Broadcom VideoCore support" depends on HAS_DMA + depends on OF depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE) default y help |