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 branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
[sfrench/cifs-2.6.git]
/
fs
/
Makefile
diff --git
a/fs/Makefile
b/fs/Makefile
index fcae06aaadc50a762a02bff845c704e77bd388a6..3b2178b4bb66a6a776aa34b287123c8ef6552d3f 100644
(file)
--- a/
fs/Makefile
+++ b/
fs/Makefile
@@
-19,6
+19,7
@@
else
obj-y += no-block.o
endif
+obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
obj-$(CONFIG_INOTIFY) += inotify.o
obj-$(CONFIG_INOTIFY_USER) += inotify_user.o
obj-$(CONFIG_EPOLL) += eventpoll.o