From b60b29f442081bde4300e674d56f9012feeab015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Tue, 5 Oct 2004 08:11:11 +0000
Subject: [PATCH] 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
---
 firmware/SOURCES           | 3 ++-
 firmware/drivers/ata.c     | 5 -----
 firmware/drivers/ata_mmc.c | 5 -----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 63ae6148c2..db3eb42620 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 4ba5829f56..62b4fb6d8c 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 7a9a67839d..7a187f092b 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 */
-