Merge commit 'v2.6.29-rc1' into x86/urgent

[karo-tx-linux.git] / drivers / w1 / w1_family.h

diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 30531331a643527860415450341a104df40543ab..3ca1b9298f2143dea98a2973021cdafe254bad38 100644 (file)
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -33,6 +33,7 @@
 #define W1_THERM_DS1822        0x22
 #define W1_EEPROM_DS2433       0x23
 #define W1_THERM_DS18B20       0x28
+#define W1_EEPROM_DS2431       0x2D
 #define W1_FAMILY_DS2760       0x30
 
 #define MAXNAMELEN             32