---

yaml --- r: 47823 b: refs/heads/master c: 2c8dc07 h: refs/heads/master i: 47821: 4e00e03 47819: 1704188 47815: df886e6 47807: dbae77e v: v3
git-mirror · Jan 18, 2007 · 1f593ef · 1f593ef
1 parent faad928
commit 1f593ef
Show file tree

Hide file tree

Showing 3 changed files with 225 additions and 92 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e3589e59c35ed33823dda3d38ad171222b83b4
+refs/heads/master: 2c8dc071517ec2843869024dc82be2e246f41064
diff --git a/trunk/drivers/input/touchscreen/Kconfig b/trunk/drivers/input/touchscreen/Kconfig
@@ -12,13 +12,18 @@ menuconfig INPUT_TOUCHSCREEN
 if INPUT_TOUCHSCREEN
 
 config TOUCHSCREEN_ADS7846
-	tristate "ADS 7846 based touchscreens"
+	tristate "ADS 7846/7843 based touchscreens"
 	depends on SPI_MASTER
+	depends on HWMON = n || HWMON
 	help
 	  Say Y here if you have a touchscreen interface using the
-	  ADS7846 controller, and your board-specific initialization
+	  ADS7846 or ADS7843 controller, and your board-specific setup
 	  code includes that in its table of SPI devices.
 
+	  If HWMON is selected, and the driver is told the reference voltage
+	  on your board, you will also get hwmon interfaces for the voltage
+	  (and on ads7846, temperature) sensors of this chip.
+
 	  If unsure, say N (but it's safe to say "Y").
 
 	  To compile this driver as a module, choose M here: the