Compile ata_mmc.c for targets with mmc, ata.c for all others.

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

3 files changed, 2 insertions, 11 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 63ae614..db3eb42 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -23,9 +23,10 @@ common/strtok.c
 common/timefuncs.c
 debug.c
 drivers/adc.c
-drivers/ata.c
 #ifdef HAVE_MMC
 drivers/ata_mmc.c
+#else
+drivers/ata.c
 #endif
 drivers/button.c
 drivers/dac.c
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 4ba5829..62b4fb6 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -30,9 +30,6 @@
 #include "string.h"
 #include "hwcompat.h"
 
-/* skip whole file for an MMC-based system, FIXME in makefile */
-#ifndef HAVE_MMC 
-
 #if CONFIG_CPU == SCF5249
 
 /* don't use sh7034 assembler routines */
@@ -1202,5 +1199,3 @@ int ata_init(void)
 
     return 0;
 }
-
-#endif /* #ifndef HAVE_MMC */
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 7a9a678..7a187f0 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -33,9 +33,6 @@
 
 #include "bitswap.h"
 
-/* use file for an MMC-based system, FIXME in makefile */
-#ifdef HAVE_MMC
-
 #define SECTOR_SIZE     512
 
 /* Command definitions */
@@ -702,5 +699,3 @@ int ata_init(void)
     return rc;
 }
 
-#endif /* #ifdef HAVE_MMC */
-