Merge 4.0-rc7 into staging-next

[mirror_ubuntu-artful-kernel.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 46379b1fb25b59b10018a121b2cc8dc78082d4a6..f96074a15ac89b81c966be1d2ed71249d2de2923 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -187,10 +187,11 @@ config MAX1363
          data via the iio dev interface.
 
 config MCP320X
-       tristate "Microchip Technology MCP3204/08"
+       tristate "Microchip Technology MCP3x01/02/04/08"
        depends on SPI
        help
-         Say yes here to build support for Microchip Technology's MCP3204 or
+         Say yes here to build support for Microchip Technology's
+         MCP3001, MCP3002, MCP3004, MCP3008, MCP3201, MCP3202, MCP3204 or
          MCP3208 analog to digital converter.
 
          This driver can also be built as a module. If so, the module will be