Merge tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 2f21300..84c5e4c 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -17,7 +17,7 @@ obj-y :=      open.o read_write.o file_table.o super.o \
                kernel_read_file.o remap_range.o
 
 ifeq ($(CONFIG_BLOCK),y)
-obj-y +=       buffer.o block_dev.o direct-io.o mpage.o
+obj-y +=       buffer.o direct-io.o mpage.o
 else
 obj-y +=       no-block.o
 endif
@@ -96,7 +96,7 @@ obj-$(CONFIG_LOCKD)           += lockd/
 obj-$(CONFIG_NLS)              += nls/
 obj-$(CONFIG_UNICODE)          += unicode/
 obj-$(CONFIG_SYSV_FS)          += sysv/
-obj-$(CONFIG_CIFS_COMMON)      += cifs_common/
+obj-$(CONFIG_SMBFS_COMMON)     += smbfs_common/
 obj-$(CONFIG_CIFS)             += cifs/
 obj-$(CONFIG_SMB_SERVER)       += ksmbd/
 obj-$(CONFIG_HPFS_FS)          += hpfs/