diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-07 16:17:06 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-07 16:17:06 +0000 |
| commit | 73f2662b3fa8e7151168bfd7f070880c53bc5663 (patch) | |
| tree | dc287a630c8e19159b1f44f8e237f64aa1554814 /fs/notify/inotify/inotify.h | |
| parent | d94905e019acce960feeda1f92a9427fbe45ebbe (diff) | |
| parent | 00fd9619120db1d6a19be2f9e3df6f76234b311b (diff) | |
Merge branch 'topic/of-graph' of git://git.pengutronix.de/git/pza/linux into imx-drm-staging
Merge the of-graph dependency for imx-drm. These will be the basis of
the new DT bindings for imx-drm.
Diffstat (limited to 'fs/notify/inotify/inotify.h')
| -rw-r--r-- | fs/notify/inotify/inotify.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/inotify/inotify.h b/fs/notify/inotify/inotify.h index 485eef3f4407..ed855ef6f077 100644 --- a/fs/notify/inotify/inotify.h +++ b/fs/notify/inotify/inotify.h @@ -27,6 +27,6 @@ extern int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, u32 mask, void *data, int data_type, - const unsigned char *file_name); + const unsigned char *file_name, u32 cookie); extern const struct fsnotify_ops inotify_fsnotify_ops; |