Merge branch 'upstream' into topic/asoc

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

diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index 904e5ae..8d0b1fb 100644 (file)
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -3,25 +3,21 @@
 #
 
 menu "1-wire Slaves"
-       depends on W1
 
 config W1_SLAVE_THERM
        tristate "Thermal family implementation"
-       depends on W1
        help
          Say Y here if you want to connect 1-wire thermal sensors to your
          wire.
 
 config W1_SLAVE_SMEM
        tristate "Simple 64bit memory family implementation"
-       depends on W1
        help
          Say Y here if you want to connect 1-wire
          simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire.
 
 config W1_SLAVE_DS2433
        tristate "4kb EEPROM family support (DS2433)"
-       depends on W1
        help
          Say Y here if you want to use a 1-wire
          4kb EEPROM family device (DS2433).
@@ -35,4 +31,24 @@ config W1_SLAVE_DS2433_CRC
          Each block has 30 bytes of data and a two byte CRC16.
          Full block writes are only allowed if the CRC is valid.
 
+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.
+
+         The battery monitor chip is used in many batteries/devices
+         as the one who is responsible for charging/discharging/monitoring
+         Li+ batteries.
+
+         If you are unsure, say N.
+
+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.
+
 endmenu