From a16cbdc4163e895323c1b92ff5ff7f4e925a99b5 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Wed, 10 Dec 2014 05:05:41 +0100
Subject: Rename memory.c to gba_memory.c

---
 Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index 39dd9e9..aef6d23 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,7 +7,7 @@ SOURCES_C := $(CORE_DIR)/gpsp_griffin.c
 else
 SOURCES_C := $(CORE_DIR)/main.c \
 				 $(CORE_DIR)/cpu.c \
-				 $(CORE_DIR)/memory.c \
+				 $(CORE_DIR)/gba_memory.c \
 				 $(CORE_DIR)/video.c \
 				 $(CORE_DIR)/input.c \
 				 $(CORE_DIR)/sound.c \
-- 
cgit v1.2.3