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 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
[firefly-linux-kernel-4.4.55.git]
/
include
/
media
/
saa7146.h
diff --git
a/include/media/saa7146.h
b/include/media/saa7146.h
index ac7ce00f39cff70a1fdd70e9b32dfb4c4a62c46f..79827143d5acd925510f3ad7a4de2f912c49ff48 100644
(file)
--- a/
include/media/saa7146.h
+++ b/
include/media/saa7146.h
@@
-115,7
+115,7
@@
struct saa7146_dev
/* different device locks */
spinlock_t slock;
- struct mutex lock;
+ struct mutex
v4l2_
lock;
unsigned char __iomem *mem; /* pointer to mapped IO memory */
u32 revision; /* chip revision; needed for bug-workarounds*/