From 84ac86f3d1a9c5fe1b73e34204b7176d9df663d5 Mon Sep 17 00:00:00 2001
From: "bernard.xiong" <bernard.xiong@gmail.com>
Date: Fri, 21 Jan 2011 10:21:26 +0000
Subject: [PATCH] fix compiling error.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1252 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/mini2440/application.c | 2 ++
 bsp/mini2440/rtconfig.h    | 2 +-
 components/dfs/SConscript  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bsp/mini2440/application.c b/bsp/mini2440/application.c
index b95e602eb4..5c6ddbea7f 100644
--- a/bsp/mini2440/application.c
+++ b/bsp/mini2440/application.c
@@ -31,9 +31,11 @@
 #include <dfs_elm.h>
 /* dfs Filesystem APIs */
 #include <dfs_fs.h>
+#ifdef RT_USING_DFS_UFFS
 /* dfs filesystem:UFFS filesystem init */
 #include <dfs_uffs.h>
 #endif
+#endif
 
 #ifdef RT_USING_LWIP
 #include <netif/ethernetif.h>
diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h
index 71e55f074d..21266626ae 100644
--- a/bsp/mini2440/rtconfig.h
+++ b/bsp/mini2440/rtconfig.h
@@ -96,7 +96,7 @@
 /* the max number of file length 		*/
 #define RT_DFS_ELM_MAX_LFN		32
 /* #define RT_USING_DFS_YAFFS2 */
-#define RT_USING_UFFS
+/* #define RT_USING_DFS_UFFS */
 
 #define RT_USING_DFS_NFS
 #define RT_NFS_HOST_EXPORT		"192.168.1.5:/"
diff --git a/components/dfs/SConscript b/components/dfs/SConscript
index 2914dbaf74..63be90e533 100644
--- a/components/dfs/SConscript
+++ b/components/dfs/SConscript
@@ -117,7 +117,7 @@ if GetDepend('RT_USING_DFS_DEVFS'):
     src_local = src_local + devfs
     path = path + [RTT_ROOT + '/components/dfs/filesystems/devfs']
 
-if GetDepend('RT_USING_DFS_DEVFS'):
+if GetDepend('RT_USING_DFS_UFFS'):
     src_local = src_local + uffs
     path = path + [RTT_ROOT + '/components/dfs/filesystems/uffs/src/inc', RTT_ROOT + '/components/dfs/filesystems/uffs', RTT_ROOT + '/components/dfs/filesystems/uffs/flash']
 
-- 
GitLab