aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-02-22 02:29:48 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-28 18:27:09 -0500
commitadffe4ab961113c5db8fee802f8e39b82a15d8e1 (patch)
tree0e01d3006aa0084fc693de050f658824eed755aa /drivers/w1
parente0117521e555224ec8938e69832b0b4c69954d54 (diff)
w1: Remove excess dependencies on W1 for masters and slaves
Configuration for masters and slaves is included only if W1 symbol enabled, so no reason to check it once more. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/Kconfig3
-rw-r--r--drivers/w1/slaves/Kconfig5
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index efc7f075fcbe..6ffe120efcc3 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -36,13 +36,12 @@ config W1_MASTER_DS2482
36 36
37config W1_MASTER_MXC 37config W1_MASTER_MXC
38 tristate "Freescale MXC 1-wire busmaster" 38 tristate "Freescale MXC 1-wire busmaster"
39 depends on W1 && ARCH_MXC 39 depends on ARCH_MXC
40 help 40 help
41 Say Y here to enable MXC 1-wire host 41 Say Y here to enable MXC 1-wire host
42 42
43config W1_MASTER_DS1WM 43config W1_MASTER_DS1WM
44 tristate "Maxim DS1WM 1-wire busmaster" 44 tristate "Maxim DS1WM 1-wire busmaster"
45 depends on W1
46 help 45 help
47 Say Y here to enable the DS1WM 1-wire driver, such as that 46 Say Y here to enable the DS1WM 1-wire driver, such as that
48 in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like 47 in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index 5e6a3c9e510b..1cdce80b6abf 100644
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -72,7 +72,6 @@ config W1_SLAVE_DS2433_CRC
72 72
73config W1_SLAVE_DS2760 73config W1_SLAVE_DS2760
74 tristate "Dallas 2760 battery monitor chip (HP iPAQ & others)" 74 tristate "Dallas 2760 battery monitor chip (HP iPAQ & others)"
75 depends on W1
76 help 75 help
77 If you enable this you will have the DS2760 battery monitor 76 If you enable this you will have the DS2760 battery monitor
78 chip support. 77 chip support.
@@ -85,7 +84,6 @@ config W1_SLAVE_DS2760
85 84
86config W1_SLAVE_DS2780 85config W1_SLAVE_DS2780
87 tristate "Dallas 2780 battery monitor chip" 86 tristate "Dallas 2780 battery monitor chip"
88 depends on W1
89 help 87 help
90 If you enable this you will have the DS2780 battery monitor 88 If you enable this you will have the DS2780 battery monitor
91 chip support. 89 chip support.
@@ -98,7 +96,6 @@ config W1_SLAVE_DS2780
98 96
99config W1_SLAVE_DS2781 97config W1_SLAVE_DS2781
100 tristate "Dallas 2781 battery monitor chip" 98 tristate "Dallas 2781 battery monitor chip"
101 depends on W1
102 help 99 help
103 If you enable this you will have the DS2781 battery monitor 100 If you enable this you will have the DS2781 battery monitor
104 chip support. 101 chip support.
@@ -111,7 +108,6 @@ config W1_SLAVE_DS2781
111 108
112config W1_SLAVE_DS28E04 109config W1_SLAVE_DS28E04
113 tristate "4096-Bit Addressable 1-Wire EEPROM with PIO (DS28E04-100)" 110 tristate "4096-Bit Addressable 1-Wire EEPROM with PIO (DS28E04-100)"
114 depends on W1
115 select CRC16 111 select CRC16
116 help 112 help
117 If you enable this you will have the DS28E04-100 113 If you enable this you will have the DS28E04-100
@@ -124,7 +120,6 @@ config W1_SLAVE_DS28E04
124 120
125config W1_SLAVE_BQ27000 121config W1_SLAVE_BQ27000
126 tristate "BQ27000 slave support" 122 tristate "BQ27000 slave support"
127 depends on W1
128 help 123 help
129 Say Y here if you want to use a hdq 124 Say Y here if you want to use a hdq
130 bq27000 slave support. 125 bq27000 slave support.