From 19be2cafea4960269225f7b9a78b7e5442e11494 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 Jun 2016 08:41:02 -0600 Subject: [PATCH] Fix name collision in flash_eraseall restoration. --- system/flash_eraseall/Makefile | 2 +- .../flash_eraseall/{flash_eraseall.c => flash_eraseall_main.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename system/flash_eraseall/{flash_eraseall.c => flash_eraseall_main.c} (100%) diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index d9e97e5d1..cad71b307 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -55,7 +55,7 @@ STACKSIZE = 1024 ASRCS = CSRCS = -MAINSRC = flash_eraseall.c +MAINSRC = flash_eraseall_main.c AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/system/flash_eraseall/flash_eraseall.c b/system/flash_eraseall/flash_eraseall_main.c similarity index 100% rename from system/flash_eraseall/flash_eraseall.c rename to system/flash_eraseall/flash_eraseall_main.c