avr32: Compile atmel_mci.o conditionally

Remove #ifdef CONFIG_MMC from the source file and use conditional
compilation in the Makefile instead.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile
index 29f9c0d04aee7470190640cf200be4c87acd6cc7..d16c58b77388f368a4d680f2480fa8d30e3f1f33 100644 (file)
--- a/cpu/at32ap/Makefile
+++ b/cpu/at32ap/Makefile
@@ -35,7 +35,7 @@ COBJS-y                       += exception.o
 COBJS-y                        += cache.o
 COBJS-y                        += interrupts.o
 COBJS-y                        += pio.o
-COBJS-y                        += atmel_mci.o
+COBJS-$(CONFIG_MMC)    += atmel_mci.o
 
 SRCS   := $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))

diff --git a/cpu/at32ap/atmel_mci.c b/cpu/at32ap/atmel_mci.c
index 226b5c045fff15668c445445ca3ccf49ddb26712..3795addf05af60ca10e69d6e6d8e7bf086e7f3b1 100644 (file)
--- a/cpu/at32ap/atmel_mci.c
+++ b/cpu/at32ap/atmel_mci.c
@@ -21,8 +21,6 @@
  */
 #include <common.h>
 
-#ifdef CONFIG_MMC
-
 #include <part.h>
 #include <mmc.h>
 
@@ -548,5 +546,3 @@ int mmc2info(ulong addr)
 {
        return 0;
 }
-
-#endif /* CONFIG_MMC */