diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile
index f1823300a86adab5449e6065b586cd629cbc2297..33dc427681516961e9a71f2ed58127b416fc11ab 100644
--- a/cpu/at32ap/Makefile
+++ b/cpu/at32ap/Makefile
@@ -35,7 +35,6 @@ COBJS-y			+= exception.o
 COBJS-y			+= cache.o
 COBJS-y			+= interrupts.o
 COBJS-y			+= pio.o
-COBJS-$(CONFIG_ATMEL_MCI) += 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/drivers/mmc/Makefile b/drivers/mmc/Makefile
index db924245853353824df373255d2a7da62a810926..3dc031b438d6c8b845e1103f9c1d3ecb4bcfea19 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -25,6 +25,8 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libmmc.a
 
+COBJS-$(CONFIG_ATMEL_MCI) += atmel_mci.o
+
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
diff --git a/cpu/at32ap/atmel_mci.c b/drivers/mmc/atmel_mci.c
similarity index 100%
rename from cpu/at32ap/atmel_mci.c
rename to drivers/mmc/atmel_mci.c
diff --git a/cpu/at32ap/atmel_mci.h b/drivers/mmc/atmel_mci.h
similarity index 100%
rename from cpu/at32ap/atmel_mci.h
rename to drivers/mmc/atmel_mci.h