diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 12:52:12 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 12:52:12 -0500 |
| commit | ef1d17d7d808a0e4c347b67e9811459140f9704b (patch) | |
| tree | f221cdd61d3961aec1095585c1fa3d32238dbcb1 /drivers/staging | |
| parent | da849a92d3bafaf24d770e971c2c9e5c3f60b5d1 (diff) | |
| parent | 678fb42e2b2c815c3475884017aac4da22124d0d (diff) | |
Merge tag 'iio-fixes-for-3.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan says:
First round of fixes for IIO post 3.8-rc1.
A set of worthy if rather dull little fixes.
* A whole set of incorrect error handling on regulator voltage requests.
* An error in the probe path for max1363.
* A couple of Kconfig issues with missing/ignored dependencies.
* A nasty shift vs compare typo in adf4350
* Bug fixes for a silly error that prevents at91_adc driver building.
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/gyro/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig index ea295b25308c..87979a0d03a9 100644 --- a/drivers/staging/iio/gyro/Kconfig +++ b/drivers/staging/iio/gyro/Kconfig | |||
| @@ -27,8 +27,8 @@ config ADIS16130 | |||
| 27 | config ADIS16260 | 27 | config ADIS16260 |
| 28 | tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver" | 28 | tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver" |
| 29 | depends on SPI | 29 | depends on SPI |
| 30 | select IIO_TRIGGER if IIO_BUFFER | 30 | select IIO_ADIS_LIB |
| 31 | select IIO_SW_RING if IIO_BUFFER | 31 | select IIO_ADIS_LIB_BUFFER if IIO_BUFFER |
| 32 | help | 32 | help |
| 33 | Say yes here to build support for Analog Devices ADIS16260 ADIS16265 | 33 | Say yes here to build support for Analog Devices ADIS16260 ADIS16265 |
| 34 | ADIS16250 ADIS16255 and ADIS16251 programmable digital gyroscope sensors. | 34 | ADIS16250 ADIS16255 and ADIS16251 programmable digital gyroscope sensors. |