projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...
[cascardo/linux.git]
/
drivers
/
w1
/
w1.h
diff --git
a/drivers/w1/w1.h
b/drivers/w1/w1.h
index
4d012ca
..
45908e5
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;