Skip to content

Commit

Permalink
w1: Remove excess dependencies on W1 for masters and slaves
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Shiyan authored and Greg Kroah-Hartman committed Feb 28, 2014
1 parent e011752 commit adffe4a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions drivers/w1/masters/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/w1/slaves/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit adffe4a

Please sign in to comment.