summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 09:52:12 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 09:52:12 -0800
commitef1d17d7d808a0e4c347b67e9811459140f9704b (patch)
treef221cdd61d3961aec1095585c1fa3d32238dbcb1 /drivers/staging
parentda849a92d3bafaf24d770e971c2c9e5c3f60b5d1 (diff)
parent678fb42e2b2c815c3475884017aac4da22124d0d (diff)
downloadop-kernel-dev-ef1d17d7d808a0e4c347b67e9811459140f9704b.zip
op-kernel-dev-ef1d17d7d808a0e4c347b67e9811459140f9704b.tar.gz
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/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index ea295b2..87979a0 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -27,8 +27,8 @@ config ADIS16130
config ADIS16260
tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver"
depends on SPI
- select IIO_TRIGGER if IIO_BUFFER
- select IIO_SW_RING if IIO_BUFFER
+ select IIO_ADIS_LIB
+ select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
help
Say yes here to build support for Analog Devices ADIS16260 ADIS16265
ADIS16250 ADIS16255 and ADIS16251 programmable digital gyroscope sensors.
OpenPOWER on IntegriCloud