diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 12:31:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 12:31:00 -0400 |
| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e (patch) | |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 /drivers/iio | |
| parent | 1c1b86215730ef07d8851c2247b9ecf73038d05d (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
Merge 3.5-rc4 into staging-next
This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index 612073f6c540..d4984c8be973 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig | |||
| @@ -8,8 +8,7 @@ menuconfig IIO | |||
| 8 | help | 8 | help |
| 9 | The industrial I/O subsystem provides a unified framework for | 9 | The industrial I/O subsystem provides a unified framework for |
| 10 | drivers for many different types of embedded sensors using a | 10 | drivers for many different types of embedded sensors using a |
| 11 | number of different physical interfaces (i2c, spi, etc). See | 11 | number of different physical interfaces (i2c, spi, etc). |
| 12 | Documentation/iio for more information. | ||
| 13 | 12 | ||
| 14 | if IIO | 13 | if IIO |
| 15 | 14 | ||