[PATCH] USB: fix pm patches with CONFIG_PM off part 2

[powerpc.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index f830826..d890078 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -75,11 +75,9 @@ struct w1_slave
 
        struct w1_master        *master;
        struct w1_family        *family;
+       void                    *family_data;
        struct device           dev;
-       struct completion       dev_released;
-
-       struct bin_attribute    attr_bin;
-       struct device_attribute attr_name;
+       struct completion       released;
 };
 
 typedef void (* w1_slave_found_callback)(unsigned long, u64);
@@ -179,7 +177,6 @@ struct w1_master
 
        struct device_driver    *driver;
        struct device           dev;
-       struct completion       dev_released;
        struct completion       dev_exited;
 
        struct w1_bus_master    *bus_master;