Restore __ALIGN_MASK()

[safe/jmp/linux-2.6] / drivers / w1 / w1_family.h

diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 218f127..3ca1b92 100644 (file)
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -31,17 +31,19 @@
 #define W1_FAMILY_SMEM_81      0x81
 #define W1_THERM_DS18S20       0x10
 #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
 
+struct w1_slave;
+
 struct w1_family_ops
 {
-       ssize_t (* rname)(struct device *, struct device_attribute *, char *);
-       ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t);
-
-       ssize_t (* rval)(struct device *, struct device_attribute *, char *);
-       unsigned char rvalname[MAXNAMELEN];
+       int  (* add_slave)(struct w1_slave *);
+       void (* remove_slave)(struct w1_slave *);
 };
 
 struct w1_family
@@ -52,15 +54,12 @@ struct w1_family
        struct w1_family_ops    *fops;
 
        atomic_t                refcnt;
-       u8                      need_exit;
 };
 
 extern spinlock_t w1_flock;
 
-void w1_family_get(struct w1_family *);
 void w1_family_put(struct w1_family *);
 void __w1_family_get(struct w1_family *);
-void __w1_family_put(struct w1_family *);
 struct w1_family * w1_family_registered(u8);
 void w1_unregister_family(struct w1_family *);
 int w1_register_family(struct w1_family *);