diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
| commit | f6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch) | |
| tree | 68f44e3d64ebbee9f89c459136702ca243bbfa61 /drivers/iio/Kconfig | |
| parent | e0246e8ecad10b9437381b89756292ac031d4cfa (diff) | |
| parent | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff) | |
| download | blackbird-op-linux-f6f1f12f6d4e9e4a44587e58ec96db25673083ec.tar.gz blackbird-op-linux-f6f1f12f6d4e9e4a44587e58ec96db25673083ec.zip | |
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical
Some OMAP AM35xx fixes.
The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework. Also the UART4
and HSOTGUSB warnings have been fixed.
Diffstat (limited to 'drivers/iio/Kconfig')
| -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 56eecefcec75..2ec93da41e2c 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -8,8 +8,7 @@ menuconfig IIO help The industrial I/O subsystem provides a unified framework for drivers for many different types of embedded sensors using a - number of different physical interfaces (i2c, spi, etc). See - Documentation/iio for more information. + number of different physical interfaces (i2c, spi, etc). if IIO |
