Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

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

diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index f9d4c91fc533cee5caca916b77dfc62642067629..df95d6c2cefa01124b1513d2b5a07514cfb21c48 100644 (file)
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -9,7 +9,7 @@ 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 you
+         Say Y here if you want to connect 1-wire thermal sensors to your
          wire.
 
 config W1_SLAVE_SMEM
@@ -17,7 +17,7 @@ config W1_SLAVE_SMEM
        depends on W1
        help
          Say Y here if you want to connect 1-wire
-         simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
+         simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire.
 
 config W1_SLAVE_DS2433
        tristate "4kb EEPROM family support (DS2433)"
@@ -28,11 +28,24 @@ config W1_SLAVE_DS2433
 
 config W1_SLAVE_DS2433_CRC
        bool "Protect DS2433 data with a CRC16"
-       depends on W1_DS2433
+       depends on W1_SLAVE_DS2433
        select CRC16
        help
          Say Y here to protect DS2433 data with a CRC16.
          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.
+
 endmenu