---

yaml --- r: 304485 b: refs/heads/master c: 5d4a678 h: refs/heads/master i: 304483: 6ad223d v: v3
git-mirror · Apr 30, 2012 · fcaa881 · fcaa881
1 parent 5877158
commit fcaa881
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db3b9e990e75573402cda22faf933760f076c033
+refs/heads/master: 5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd
diff --git a/trunk/drivers/staging/iio/adc/Kconfig b/trunk/drivers/staging/iio/adc/Kconfig
@@ -195,12 +195,14 @@ config MAX1363_RING_BUFFER
 
 config LPC32XX_ADC
 	tristate "NXP LPC32XX ADC"
-	depends on ARCH_LPC32XX && !TOUCHSCREEN_LPC32XX
+	depends on ARCH_LPC32XX
 	help
 	  Say yes here to build support for the integrated ADC inside the
 	  LPC32XX SoC. Note that this feature uses the same hardware as the
-	  touchscreen driver, so you can only select one of the two drivers
-	  (lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs.
+	  touchscreen driver, so you should either select only one of the two
+	  drivers (lpc32xx_adc or lpc32xx_ts) or, in the OpenFirmware case,
+	  activate only one via device tree selection.  Provides direct access
+	  via sysfs.
 
 config SPEAR_ADC
 	tristate "ST SPEAr ADC"