diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:24:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:24:24 -0800 |
| commit | cec6062037783a762aa5606b06b8bc5c14d9657f (patch) | |
| tree | c862659eb55e44314f6d524f5479204994b91901 /fs/Makefile | |
| parent | 88f07ffb63add018bfafd480ec6a294088277f06 (diff) | |
| parent | 2056a782f8e7e65fd4bfd027506b4ce1c5e9ccd4 (diff) | |
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23
[PATCH] relay: consolidate sendfile() and read() code
[PATCH] relay: add sendfile() support
[PATCH] relay: migrate from relayfs to a generic relay API
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 1db711319c8..080b3867be4 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -91,7 +91,6 @@ obj-$(CONFIG_AUTOFS4_FS) += autofs4/ obj-$(CONFIG_ADFS_FS) += adfs/ obj-$(CONFIG_FUSE_FS) += fuse/ obj-$(CONFIG_UDF_FS) += udf/ -obj-$(CONFIG_RELAYFS_FS) += relayfs/ obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/ obj-$(CONFIG_JFS_FS) += jfs/ obj-$(CONFIG_XFS_FS) += xfs/ |