projects
/
linux-2.6-block.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.kernel.org/pub/scm/linux/kernel/git/shaggy...
[linux-2.6-block.git]
/
fs
/
fuse
/
Makefile
diff --git
a/fs/fuse/Makefile
b/fs/fuse/Makefile
index c3e1f760cac9b4d456269dedb934adbc56036e46..72437065f6adee64994145be01efd281c482596a 100644
(file)
--- a/
fs/fuse/Makefile
+++ b/
fs/fuse/Makefile
@@
-4,4
+4,4
@@
obj-$(CONFIG_FUSE_FS) += fuse.o
obj-$(CONFIG_FUSE_FS) += fuse.o
-fuse-objs := dev.o dir.o file.o inode.o
+fuse-objs := dev.o dir.o file.o inode.o
control.o