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 c4493091c655d109dd008983183048b02c2a304e..636d4f767ea221e7dc5db4118d647d78276a0433 100644 (file)
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -42,6 +42,13 @@ config W1_MASTER_DS1WM
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
          hx4700.
 
+config HDQ_MASTER_OMAP
+       tristate "OMAP HDQ driver"
+       depends on ARCH_OMAP2430 || ARCH_OMAP34XX
+       help
+         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