diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 09:30:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 09:30:15 -0700 |
| commit | 754451342fc5954061ede74b0a8485ec4a4c6eaa (patch) | |
| tree | 82daccba5779de492631c42e47a614bd9d4cddd2 /fs/Makefile | |
| parent | bf232e460a3530adf17da7d7f1332347b73a3d08 (diff) | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index add789ea270a..c9375fd2c8c4 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -11,7 +11,7 @@ obj-y := open.o read_write.o file_table.o super.o \ ioctl.o readdir.o select.o dcache.o inode.o \ attr.o bad_inode.o file.o filesystems.o namespace.o \ seq_file.o xattr.o libfs.o fs-writeback.o \ - pnode.o splice.o sync.o utimes.o \ + pnode.o splice.o sync.o utimes.o d_path.o \ stack.o fs_struct.o statfs.o fs_pin.o nsfs.o ifeq ($(CONFIG_BLOCK),y) |