Patch "iio:adc:cc10001_adc: fix Kconfig dependency" has been added to the 4.1-stable tree

Patch "iio:adc:cc10001_adc: fix Kconfig dependency" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    iio:adc:cc10001_adc: fix Kconfig dependency

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iio-adc-cc10001_adc-fix-kconfig-dependency.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From b2b3c3dc6a7bef886850920f5f5dca041b443aa0 Mon Sep 17 00:00:00 2001
From: Hartmut Knaack <knaack.h@gmx.de>
Date: Sun, 21 Jun 2015 12:15:50 +0200
Subject: iio:adc:cc10001_adc: fix Kconfig dependency

From: Hartmut Knaack <knaack.h@gmx.de>

commit b2b3c3dc6a7bef886850920f5f5dca041b443aa0 upstream.

The Cosmic Circuits 10001 ADC driver depends on HAS_IOMEM, HAVE_CLK and
REGULATOR together, not just any of these.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/iio/adc/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -146,8 +146,7 @@ config DA9150_GPADC
 
 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


Patches currently in stable-queue which might be from knaack.h@gmx.de are

queue-4.1/iio-accel-bmc150-accel-fix-counting-direction.patch
queue-4.1/iio-light-cm3323-clear-bitmask-before-set.patch
queue-4.1/iio-adc-cc10001_adc-fix-kconfig-dependency.patch