[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

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

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 6b5f7be50b8ac2f6c8da6cae765c83c7422a416e..4f0a986e33e3f6332a688c35c1c2923ac1530ccd 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -151,6 +151,9 @@ struct w1_bus_master
        void            (*search)(unsigned long, w1_slave_found_callback);
 };
 
+#define W1_MASTER_NEED_EXIT            0
+#define W1_MASTER_NEED_RECONNECT       1
+
 struct w1_master
 {
        struct list_head        w1_master_entry;
@@ -169,7 +172,8 @@ struct w1_master
        void                    *priv;
        int                     priv_size;
 
-       int                     need_exit;
+       long                    flags;
+
        pid_t                   kpid;
        struct semaphore        mutex;