diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig
index 45ffdf6c26..c81f4555d6 100644
--- a/fs/yaffs2/Kconfig
+++ b/fs/yaffs2/Kconfig
@@ -1,5 +1,17 @@
+config YAFFS_DIRECT
+	bool
+
+config YAFFS_PROVIDE_DEFS
+	bool
+
+config YAFFSFS_PROVIDE_VALUES
+	bool
+
 config YAFFS2
 	bool "YAFFS2 filesystem support"
+	select YAFFS_DIRECT
+	select YAFFS_PROVIDE_DEFS
+	select YAFFSFS_PROVIDE_VALUES
 	help
 	  This provides access to YAFFS2 filesystems. Yet Another Flash
 	  Filesystem 2 is a filesystem designed specifically for NAND flash.
diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile
index 3c1bb4492b..02cae26555 100644
--- a/fs/yaffs2/Makefile
+++ b/fs/yaffs2/Makefile
@@ -16,7 +16,3 @@ obj-y := \
 	yaffs_packedtags1.o yaffs_packedtags2.o yaffs_qsort.o \
 	yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \
 	yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o
-
-ccflags-y = -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM \
-		-DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE \
-		-DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES