git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
fs
/
notify
/
inotify
/
Makefile
diff --git
a/fs/notify/inotify/Makefile
b/fs/notify/inotify/Makefile
index
e290f3b
..
9438281
100644
(file)
--- a/
fs/notify/inotify/Makefile
+++ b/
fs/notify/inotify/Makefile
@@
-1,2
+1,2
@@
obj-$(CONFIG_INOTIFY) += inotify.o
-obj-$(CONFIG_INOTIFY_USER) += inotify_user.o
+obj-$(CONFIG_INOTIFY_USER) += inotify_
fsnotify.o inotify_
user.o