Commit c18fafc8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'iio-fixes-for-4.0b' of...

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).
parents d582cb79 36086889
...@@ -640,6 +640,7 @@ static int ssp_remove(struct spi_device *spi) ...@@ -640,6 +640,7 @@ static int ssp_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int ssp_suspend(struct device *dev) static int ssp_suspend(struct device *dev)
{ {
int ret; int ret;
...@@ -688,6 +689,7 @@ static int ssp_resume(struct device *dev) ...@@ -688,6 +689,7 @@ static int ssp_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops ssp_pm_ops = { static const struct dev_pm_ops ssp_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume) SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)
......
...@@ -127,6 +127,7 @@ config HID_SENSOR_PROX ...@@ -127,6 +127,7 @@ config HID_SENSOR_PROX
config JSA1212 config JSA1212
tristate "JSA1212 ALS and proximity sensor driver" tristate "JSA1212 ALS and proximity sensor driver"
depends on I2C depends on I2C
select REGMAP_I2C
help help
Say Y here if you want to build a IIO driver for JSA1212 Say Y here if you want to build a IIO driver for JSA1212
proximity & ALS sensor device. proximity & ALS sensor device.
......
...@@ -18,6 +18,8 @@ config AK8975 ...@@ -18,6 +18,8 @@ config AK8975
config AK09911 config AK09911
tristate "Asahi Kasei AK09911 3-axis Compass" tristate "Asahi Kasei AK09911 3-axis Compass"
depends on I2C
depends on GPIOLIB
select AK8975 select AK8975
help help
Deprecated: AK09911 is now supported by AK8975 driver. Deprecated: AK09911 is now supported by AK8975 driver.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment