From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Mar 2017 07:11:25 +0000 (+0200)
Subject: Merge 4.11-rc4 into staging-next
X-Git-Tag: v4.12-rc1~84^2~352
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1c816bad41fea5470e8077ae4e661f3f9b5ada64;p=linux-block.git

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>
---

1c816bad41fea5470e8077ae4e661f3f9b5ada64
diff --cc drivers/staging/vc04_services/Kconfig
index 136baeaea57d,74094fff4367..9e2763663ab8
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@@ -1,17 -1,9 +1,18 @@@
 -config BCM2835_VCHIQ
 -	tristate "Videocore VCHIQ"
 +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
 +		Support for Broadcom VideoCore services including
 +		the BCM2835 family of products which is used
 +		by the Raspberry PI.
 +
 +if BCM_VIDEOCORE
 +
 +config BCM2835_VCHIQ
 +	tristate "BCM2835 VCHIQ"
  	help
  		Kernel to VideoCore communication interface for the
  		BCM2835 family of products.