Don't initialise disk_* for the sim, and make sure disk.c isn't built at all

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26630 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 1 insertions, 2 deletions

diff --git a/apps/main.c b/apps/main.c
index f8dddcd9ae..858ec03847 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -342,7 +342,6 @@ static void init(void)
     sb_skin_init();
     viewportmanager_init();
 
-    disk_init_subsystem();
     storage_init();
     settings_reset();
     settings_load(SETTINGS_ALL);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 292210d1c1..c716b78432 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -70,11 +70,11 @@ common/crc32-mi4.c
 #ifndef SIMULATOR
 common/dir_uncached.c
 common/file.c
+common/disk.c
 #endif /* SIMULATOR */
 #ifdef HAVE_DIRCACHE
 common/dircache.c
 #endif /* HAVE_DIRCACHE */
-common/disk.c
 common/filefuncs.c
 common/format.c
 common/strcasecmp.c