projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/intel8x0' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
i2c.h
diff --git
a/include/linux/i2c.h
b/include/linux/i2c.h
index fcfbfea3af72d670d7100ca221014c7dece36363..c86c3b07604c2cf46cd492ef948e826f2d9c58d0 100644
(file)
--- a/
include/linux/i2c.h
+++ b/
include/linux/i2c.h
@@
-361,7
+361,7
@@
struct i2c_adapter {
struct mutex bus_lock;
struct mutex clist_lock;
- int timeout;
+ int timeout;
/* in jiffies */
int retries;
struct device dev; /* the adapter device */