MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/

git mv arch/mips/{emma2rh,emma} and fixups Makefiles. We'll put all NEC EMMA series based machines there in the future. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
git-mirror · Oct 27, 2008 · f27655e · f27655e
1 parent cd741b6
commit f27655e
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 3 deletions.
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
@@ -410,15 +410,15 @@ libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/nxp/pnx8550/stb810/
 load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000
 
 #
-# NEC EMMA2RH boards
+# Common NEC EMMAXXX
 #
-core-$(CONFIG_SOC_EMMA2RH)	+= arch/mips/emma2rh/common/
+core-$(CONFIG_SOC_EMMA)		+= arch/mips/emma/common/
 cflags-$(CONFIG_SOC_EMMA2RH)	+= -I$(srctree)/arch/mips/include/asm/mach-emma2rh
 
 #
 # NEC EMMA2RH Mark-eins
 #
-core-$(CONFIG_NEC_MARKEINS)	+= arch/mips/emma2rh/markeins/
+core-$(CONFIG_NEC_MARKEINS)	+= arch/mips/emma/markeins/
 load-$(CONFIG_NEC_MARKEINS)	+= 0xffffffff88100000
 
 #

diff --git a/arch/mips/emma2rh/common/Makefile → arch/mips/emma/common/Makefile b/arch/mips/emma2rh/common/Makefile → arch/mips/emma/common/Makefile
diff --git a/arch/mips/emma2rh/common/irq.c → arch/mips/emma/common/irq.c b/arch/mips/emma2rh/common/irq.c → arch/mips/emma/common/irq.c
diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c → arch/mips/emma/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c → arch/mips/emma/common/irq_emma2rh.c
diff --git a/arch/mips/emma2rh/common/prom.c → arch/mips/emma/common/prom.c b/arch/mips/emma2rh/common/prom.c → arch/mips/emma/common/prom.c
diff --git a/arch/mips/emma2rh/markeins/Makefile → arch/mips/emma/markeins/Makefile b/arch/mips/emma2rh/markeins/Makefile → arch/mips/emma/markeins/Makefile
diff --git a/arch/mips/emma2rh/markeins/irq.c → arch/mips/emma/markeins/irq.c b/arch/mips/emma2rh/markeins/irq.c → arch/mips/emma/markeins/irq.c
diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c → arch/mips/emma/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c → arch/mips/emma/markeins/irq_markeins.c
diff --git a/arch/mips/emma2rh/markeins/led.c → arch/mips/emma/markeins/led.c b/arch/mips/emma2rh/markeins/led.c → arch/mips/emma/markeins/led.c
diff --git a/arch/mips/emma2rh/markeins/platform.c → arch/mips/emma/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c → arch/mips/emma/markeins/platform.c
diff --git a/arch/mips/emma2rh/markeins/setup.c → arch/mips/emma/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c → arch/mips/emma/markeins/setup.c