Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / Kconfig

diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index f89a1d167688bd610e4b161b3c1aedc1b7b3758e..636d4f767ea221e7dc5db4118d647d78276a0433 100644 (file)
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -49,6 +49,15 @@ config HDQ_MASTER_OMAP
          Say Y here if you want support for the 1-wire or HDQ Interface
          on an OMAP processor.
 
+config W1_MASTER_GPIO
+       tristate "GPIO 1-wire busmaster"
+       depends on GENERIC_GPIO
+       help
+         Say Y here if you want to communicate with your 1-wire devices using
+         GPIO pins. This driver uses the GPIO API to control the wire.
+
+         This support is also available as a module.  If so, the module
+         will be called w1-gpio.ko.
 
 endmenu