aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/w1/Kconfig12
-rw-r--r--drivers/w1/masters/Kconfig7
-rw-r--r--drivers/w1/slaves/Kconfig4
3 files changed, 9 insertions, 14 deletions
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index ca75b3ad3a2e..6854fd6b9714 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,8 +1,6 @@
1menu "Dallas's 1-wire bus" 1menuconfig W1
2 depends on HAS_IOMEM
3
4config W1
5 tristate "Dallas's 1-wire support" 2 tristate "Dallas's 1-wire support"
3 depends on HAS_IOMEM
6 ---help--- 4 ---help---
7 Dallas' 1-wire bus is useful to connect slow 1-pin devices 5 Dallas' 1-wire bus is useful to connect slow 1-pin devices
8 such as iButtons and thermal sensors. 6 such as iButtons and thermal sensors.
@@ -12,8 +10,10 @@ config W1
12 This W1 support can also be built as a module. If so, the module 10 This W1 support can also be built as a module. If so, the module
13 will be called wire.ko. 11 will be called wire.ko.
14 12
13if W1
14
15config W1_CON 15config W1_CON
16 depends on CONNECTOR && W1 16 depends on CONNECTOR
17 bool "Userspace communication over connector" 17 bool "Userspace communication over connector"
18 default y 18 default y
19 --- help --- 19 --- help ---
@@ -27,4 +27,4 @@ config W1_CON
27source drivers/w1/masters/Kconfig 27source drivers/w1/masters/Kconfig
28source drivers/w1/slaves/Kconfig 28source drivers/w1/slaves/Kconfig
29 29
30endmenu 30endif # W1
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 8f779338f744..8236d447adf5 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -3,11 +3,10 @@
3# 3#
4 4
5menu "1-wire Bus Masters" 5menu "1-wire Bus Masters"
6 depends on W1
7 6
8config W1_MASTER_MATROX 7config W1_MASTER_MATROX
9 tristate "Matrox G400 transport layer for 1-wire" 8 tristate "Matrox G400 transport layer for 1-wire"
10 depends on W1 && PCI 9 depends on PCI
11 help 10 help
12 Say Y here if you want to communicate with your 1-wire devices 11 Say Y here if you want to communicate with your 1-wire devices
13 using Matrox's G400 GPIO pins. 12 using Matrox's G400 GPIO pins.
@@ -17,7 +16,7 @@ config W1_MASTER_MATROX
17 16
18config W1_MASTER_DS2490 17config W1_MASTER_DS2490
19 tristate "DS2490 USB <-> W1 transport layer for 1-wire" 18 tristate "DS2490 USB <-> W1 transport layer for 1-wire"
20 depends on W1 && USB 19 depends on USB
21 help 20 help
22 Say Y here if you want to have a driver for DS2490 based USB <-> W1 bridges, 21 Say Y here if you want to have a driver for DS2490 based USB <-> W1 bridges,
23 for example DS9490*. 22 for example DS9490*.
@@ -27,7 +26,7 @@ config W1_MASTER_DS2490
27 26
28config W1_MASTER_DS2482 27config W1_MASTER_DS2482
29 tristate "Maxim DS2482 I2C to 1-Wire bridge" 28 tristate "Maxim DS2482 I2C to 1-Wire bridge"
30 depends on I2C && W1 && EXPERIMENTAL 29 depends on I2C && EXPERIMENTAL
31 help 30 help
32 If you say yes here you get support for the Maxim DS2482 31 If you say yes here you get support for the Maxim DS2482
33 I2C to 1-Wire bridge. 32 I2C to 1-Wire bridge.
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index df95d6c2cefa..3df29a122f84 100644
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -3,25 +3,21 @@
3# 3#
4 4
5menu "1-wire Slaves" 5menu "1-wire Slaves"
6 depends on W1
7 6
8config W1_SLAVE_THERM 7config W1_SLAVE_THERM
9 tristate "Thermal family implementation" 8 tristate "Thermal family implementation"
10 depends on W1
11 help 9 help
12 Say Y here if you want to connect 1-wire thermal sensors to your 10 Say Y here if you want to connect 1-wire thermal sensors to your
13 wire. 11 wire.
14 12
15config W1_SLAVE_SMEM 13config W1_SLAVE_SMEM
16 tristate "Simple 64bit memory family implementation" 14 tristate "Simple 64bit memory family implementation"
17 depends on W1
18 help 15 help
19 Say Y here if you want to connect 1-wire 16 Say Y here if you want to connect 1-wire
20 simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire. 17 simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire.
21 18
22config W1_SLAVE_DS2433 19config W1_SLAVE_DS2433
23 tristate "4kb EEPROM family support (DS2433)" 20 tristate "4kb EEPROM family support (DS2433)"
24 depends on W1
25 help 21 help
26 Say Y here if you want to use a 1-wire 22 Say Y here if you want to use a 1-wire
27 4kb EEPROM family device (DS2433). 23 4kb EEPROM family device (DS2433).