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>

diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index efc7f075fcbe2de8f09cbebbf4d0209b765379ed..6ffe120efcc37df340f25788eca40df957fb673b 100644 (file)
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -36,13 +36,12 @@ config W1_MASTER_DS2482
 
 config W1_MASTER_MXC
        tristate "Freescale MXC 1-wire busmaster"
-       depends on W1 && ARCH_MXC
+       depends on ARCH_MXC
        help
          Say Y here to enable MXC 1-wire host
 
 config W1_MASTER_DS1WM
        tristate "Maxim DS1WM 1-wire busmaster"
-       depends on W1
        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

diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index 5e6a3c9e510b43f54c4467faa4219c077a1f7bb7..1cdce80b6abfca9961cb7cb4623f9ea2ec14741f 100644 (file)
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -72,7 +72,6 @@ config W1_SLAVE_DS2433_CRC
 
 config W1_SLAVE_DS2760
        tristate "Dallas 2760 battery monitor chip (HP iPAQ & others)"
-       depends on W1
        help
          If you enable this you will have the DS2760 battery monitor
          chip support.
@@ -85,7 +84,6 @@ config W1_SLAVE_DS2760
 
 config W1_SLAVE_DS2780
        tristate "Dallas 2780 battery monitor chip"
-       depends on W1
        help
          If you enable this you will have the DS2780 battery monitor
          chip support.
@@ -98,7 +96,6 @@ config W1_SLAVE_DS2780
 
 config W1_SLAVE_DS2781
        tristate "Dallas 2781 battery monitor chip"
-       depends on W1
        help
          If you enable this you will have the DS2781 battery monitor
          chip support.
@@ -111,7 +108,6 @@ config W1_SLAVE_DS2781
 
 config W1_SLAVE_DS28E04
        tristate "4096-Bit Addressable 1-Wire EEPROM with PIO (DS28E04-100)"
-       depends on W1
        select CRC16
        help
          If you enable this you will have the DS28E04-100
@@ -124,7 +120,6 @@ config W1_SLAVE_DS28E04
 
 config W1_SLAVE_BQ27000
        tristate "BQ27000 slave support"
-       depends on W1
        help
          Say Y here if you want to use a hdq
          bq27000 slave support.