diff --git a/drivers/Makefile b/drivers/Makefile
index 70f10d19d7..df5c838f89 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -48,12 +48,10 @@ USBDEVDEPPATH	= --dep-path usbdev
 CFLAGS		+= -I$(TOPDIR)/drivers/usbdev
 endif
 
-ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
 include mmcsd/Make.defs
 ROOTDEPPATH	= --dep-path .
 MMCSDDEPPATH	= --dep-path mmcsd
 CFLAGS		+= -I$(TOPDIR)/drivers/mmcsd
-endif
 
 ASRCS		= $(NET_ASRCS) $(USBDEV_ASRCS) $(MMCSD_ASRCS)
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
diff --git a/drivers/mmcsd/Make.defs b/drivers/mmcsd/Make.defs
index 459b317d63..50552b9f9b 100644
--- a/drivers/mmcsd/Make.defs
+++ b/drivers/mmcsd/Make.defs
@@ -34,9 +34,5 @@
 ############################################################################
 
 MMCSD_ASRCS  =
-MMCSD_CSRCS  =
-
-ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
-MMCSD_CSRCS  += mmcsd_spi.c mmcsd_debug.c
-endif
+MMCSD_CSRCS  = mmcsd_spi.c mmcsd_debug.c
 
diff --git a/fs/Makefile b/fs/Makefile
index d47d1d24b8..8ab6635abe 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -50,11 +50,10 @@ CSRCS		+= fs_open.c fs_close.c fs_read.c fs_write.c fs_ioctl.c fs_lseek.c \
 		   fs_inode.c fs_inodefind.c fs_inodereserve.c fs_statfs.c \
 		   fs_inoderemove.c fs_registerdriver.c fs_unregisterdriver.c \
 		   fs_inodeaddref.c fs_inoderelease.c
-ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
 CSRCS		+= fs_registerblockdriver.c fs_unregisterblockdriver.c \
-		   fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c \
-		   fs_mount.c fs_umount.c \
-		   fs_fsync.c fs_unlink.c fs_rename.c \
+		   fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c
+ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
+CSRCS		+= fs_mount.c fs_umount.c fs_fsync.c fs_unlink.c fs_rename.c \
 		   fs_mkdir.c fs_rmdir.c
 include fat/Make.defs
 include romfs/Make.defs