From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Wed, 21 May 2008 11:01:09 +0000 (+0200)
Subject: avr32: Compile atmel_mci.o conditionally
X-Git-Tag: v1.3.4-rc1~114^2~23^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48ea623eae8674793372e3e7c95e72e5a44d7a95;p=u-boot

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 29f9c0d04a..d16c58b773 100644
--- 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 226b5c045f..3795addf05 100644
--- 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 */