projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/bcm590xx', 'regulator/topic/da9052...
[linux-2.6-microblaze.git]
/
fs
/
notify
/
inotify
/
inotify.h
diff --git
a/fs/notify/inotify/inotify.h
b/fs/notify/inotify/inotify.h
index
485eef3
..
ed855ef
100644
(file)
--- 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;