summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-28 07:19:27 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-28 07:19:27 -0800
commitc18fafc89c38251f4ddabfa2c9e0be90169c0e59 (patch)
tree305958bff8b88983e8ce71fa8a11edfa3b40a19a
parentd582cb792647dfc82345e53cff15b6ab87e2540f (diff)
parent3608688973e8c85fbcd9b7e72b90e224b8d01526 (diff)
downloadlinux-c18fafc89c38251f4ddabfa2c9e0be90169c0e59.tar.gz
linux-c18fafc89c38251f4ddabfa2c9e0be90169c0e59.tar.bz2
linux-c18fafc89c38251f4ddabfa2c9e0be90169c0e59.zip
Merge tag 'iio-fixes-for-4.0b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: Second round of IIO fixes for the 4.0 cycle (or round one part two really!) These are fixes for patches in the recent merge window and are in a separate branch to avoid rebasing the main fixes-togreg branch. * jsa1212 - select missing REGMAP_I2C * ssp_common - build warning fix for PM functions when PM not in use. * ak8975 - the addition of a utility library for this driver (as part of adding new device support) led to a dependency not being inforced for the original driver (I2C and GPIOLIB).
-rw-r--r--drivers/iio/common/ssp_sensors/ssp_dev.c2
-rw-r--r--drivers/iio/light/Kconfig1
-rw-r--r--drivers/iio/magnetometer/Kconfig2
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iio/common/ssp_sensors/ssp_dev.c b/drivers/iio/common/ssp_sensors/ssp_dev.c
index 52d70435f5a1..55a90082a29b 100644
--- a/drivers/iio/common/ssp_sensors/ssp_dev.c
+++ b/drivers/iio/common/ssp_sensors/ssp_dev.c
@@ -640,6 +640,7 @@ static int ssp_remove(struct spi_device *spi)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
static int ssp_suspend(struct device *dev)
{
int ret;
@@ -688,6 +689,7 @@ static int ssp_resume(struct device *dev)
return 0;
}
+#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops ssp_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index de1d8af00087..a224afd6380c 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -127,6 +127,7 @@ config HID_SENSOR_PROX
config JSA1212
tristate "JSA1212 ALS and proximity sensor driver"
depends on I2C
+ select REGMAP_I2C
help
Say Y here if you want to build a IIO driver for JSA1212
proximity & ALS sensor device.
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index 4c7a4c52dd06..a5d6de72c523 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -18,6 +18,8 @@ config AK8975
config AK09911
tristate "Asahi Kasei AK09911 3-axis Compass"
+ depends on I2C
+ depends on GPIOLIB
select AK8975
help
Deprecated: AK09911 is now supported by AK8975 driver.