From d052ced874172e95fdc1d096205ac4dfe38907f3 Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Thu, 26 Nov 2009 16:57:30 +0000
Subject: Merge branch 'hotswap'

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23759 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/common/dir_uncached.c | 4 ++++
 firmware/common/file.c         | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'firmware/common')

diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c
index 25677a0903..dd157f0ade 100644
--- a/firmware/common/dir_uncached.c
+++ b/firmware/common/dir_uncached.c
@@ -74,7 +74,11 @@ int release_dirs(int volume)
     int closed = 0;
     for ( dd=0; dd<MAX_OPEN_DIRS; dd++, pdir++)
     {
+#ifdef HAVE_MULTIVOLUME
         if (pdir->fatdir.file.volume == volume)
+#else
+        (void)volume;
+#endif
         {
             pdir->busy = false; /* mark as available, no further action */
             closed++;
diff --git a/firmware/common/file.c b/firmware/common/file.c
index 3d7722f687..770930d80a 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -782,7 +782,11 @@ int release_files(int volume)
     int closed = 0;
     for ( fd=0; fd<MAX_OPEN_FILES; fd++, pfile++)
     {
+#ifdef HAVE_MULTIVOLUME
         if (pfile->fatfile.volume == volume)
+#else
+        (void)volume;
+#endif
         {
             pfile->busy = false; /* mark as available, no further action */
             closed++;
-- 
cgit v1.2.3