Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 4d012ca3f32c42a27c2ccd54b9b506907abd597e..45908e56c2f834180ca0b166e44bd9fca50a5e2d 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -180,6 +180,7 @@ struct w1_master
 
        struct task_struct      *thread;
        struct mutex            mutex;
+       struct mutex            bus_mutex;
 
        struct device_driver    *driver;
        struct device           dev;