diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 04:39:29 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 04:39:29 +0300 |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /fs/overlayfs/Makefile | |
| parent | 8ce74dd6057832618957fc2cbd38fa959c3a0a6c (diff) | |
| parent | aa583096d9767892983332e7c1a984bd17e3cd39 (diff) | |
| download | linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'fs/overlayfs/Makefile')
| -rw-r--r-- | fs/overlayfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/Makefile b/fs/overlayfs/Makefile index 8f91889480d0..900daed3e91d 100644 --- a/fs/overlayfs/Makefile +++ b/fs/overlayfs/Makefile @@ -2,6 +2,6 @@ # Makefile for the overlay filesystem. # -obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o +obj-$(CONFIG_OVERLAY_FS) += overlay.o -overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o +overlay-objs := super.o inode.o dir.o readdir.o copy_up.o |