Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / w1 / w1_family.h

diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 296a87edd92250b1a78bfa07c607e32e9b4caf54..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
@@ -53,7 +54,6 @@ struct w1_family
        struct w1_family_ops    *fops;
 
        atomic_t                refcnt;
-       u8                      need_exit;
 };
 
 extern spinlock_t w1_flock;