git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
include
/
media
/
v4l2-dev.h
diff --git
a/include/media/v4l2-dev.h
b/include/media/v4l2-dev.h
index c12d72d5f008935f24806d862e2822eff51527b6..6a11d772700ff649e9a1d81b47db9f8622af3594 100644
(file)
--- a/
include/media/v4l2-dev.h
+++ b/
include/media/v4l2-dev.h
@@
-340,7
+340,7
@@
extern int video_usercopy(struct inode *inode, struct file *file,
#include <linux/mm.h>
#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
-static inline int
+static inline int
__must_check
video_device_create_file(struct video_device *vfd,
struct class_device_attribute *attr)
{