From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jul 2015 20:21:28 +0000 (-0700)
Subject: Merge 4.2-rc3 into staging-next
X-Git-Tag: next-20150824~21^2~539
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ed15e8880fc3d8d52bc02a02521054bfcb26264a;p=uclinux-h8%2Flinux.git

Merge 4.2-rc3 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

ed15e8880fc3d8d52bc02a02521054bfcb26264a
diff --cc drivers/iio/adc/Kconfig
index dace593b158b,eb0cd897714a..233d47b7dea8
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -158,13 -151,9 +158,12 @@@ config DA9150_GPAD
  	  This driver can also be built as a module. If chosen, the module name
  	  will be da9150-gpadc.
  
 +	  To compile this driver as a module, choose M here: the module will be
 +	  called berlin2-adc.
 +
  config CC10001_ADC
  	tristate "Cosmic Circuits 10001 ADC driver"
- 	depends on HAVE_CLK || REGULATOR
- 	depends on HAS_IOMEM
+ 	depends on HAS_IOMEM && HAVE_CLK && REGULATOR
  	select IIO_BUFFER
  	select IIO_TRIGGERED_BUFFER
  	help