Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410...

[linux-2.6] / drivers / w1 / masters / Kconfig

diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index c6bad4dbdc64c2d560da878369d1b7634999d823..8236d447adf5f90ecbf054bc5fa9f54a6ada8137 100644 (file)
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "1-wire Bus Masters"
-       depends on W1
 
 config W1_MASTER_MATROX
        tristate "Matrox G400 transport layer for 1-wire"
-       depends on W1 && PCI
+       depends on PCI
        help
          Say Y here if you want to communicate with your 1-wire devices
          using Matrox's G400 GPIO pins.
@@ -15,28 +14,19 @@ config W1_MASTER_MATROX
          This support is also available as a module.  If so, the module
          will be called matrox_w1.ko.
 
-config W1_MASTER_DS9490
-       tristate "DS9490R transport layer driver"
-       depends on W1 && USB
-       help
-         Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
-
-         This support is also available as a module.  If so, the module
-         will be called ds9490r.ko.
+config W1_MASTER_DS2490
+       tristate "DS2490 USB <-> W1 transport layer for 1-wire"
+       depends on USB
+       help
+         Say Y here if you want to have a driver for DS2490 based USB <-> W1 bridges,
+         for example DS9490*.
 
-config W1_MASTER_DS9490_BRIDGE
-       tristate "DS9490R USB <-> W1 transport layer for 1-wire"
-       depends on W1_MASTER_DS9490
-       help
-         Say Y here if you want to communicate with your 1-wire devices
-         using DS9490R USB bridge.
-
-         This support is also available as a module.  If so, the module
-         will be called ds_w1_bridge.ko.
+         This support is also available as a module.  If so, the module
+         will be called ds2490.ko.
 
 config W1_MASTER_DS2482
        tristate "Maxim DS2482 I2C to 1-Wire bridge"
-       depends on I2C && W1 && EXPERIMENTAL
+       depends on I2C && EXPERIMENTAL
        help
          If you say yes here you get support for the Maxim DS2482
          I2C to 1-Wire bridge.
@@ -44,5 +34,13 @@ config W1_MASTER_DS2482
          This driver can also be built as a module.  If so, the module
          will be called ds2482.
 
+config W1_MASTER_DS1WM
+       tristate "Maxim DS1WM 1-wire busmaster"
+       depends on W1 && ARM
+       help
+         Say Y here to enable the DS1WM 1-wire driver, such as that
+         in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
+         hx4700.
+
 endmenu