[PATCH] airprime.c: add Kyocera Wireless KPC650/Passport support

[linux-2.6] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index b62e771e570927fd79f4d76ccca1b7e1ffb80671..56980505e6c4451385dc361de39a894b2ffbf3d0 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -172,12 +172,11 @@ struct w1_master
 
        long                    flags;
 
-       pid_t                   kpid;
+       struct task_struct      *thread;
        struct semaphore        mutex;
 
        struct device_driver    *driver;
        struct device           dev;
-       struct completion       dev_exited;
 
        struct w1_bus_master    *bus_master;
 
@@ -203,6 +202,16 @@ static inline struct w1_master* dev_to_w1_master(struct device *dev)
        return container_of(dev, struct w1_master, dev);
 }
 
+extern int w1_max_slave_count;
+extern int w1_max_slave_ttl;
+extern spinlock_t w1_mlock;
+extern struct list_head w1_masters;
+extern struct device_driver w1_master_driver;
+extern struct device w1_master_device;
+
+int w1_process(void *data);
+void w1_reconnect_slaves(struct w1_family *f);
+
 #endif /* __KERNEL__ */
 
 #endif /* __W1_H */