diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 041c4f2e088a0e5074ff63500df897ea9c4c9b0b..28c55f608913c5da94e39127f62cdb72b94650a6 100644
--- 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 b/arch/mips/emma/common/Makefile
similarity index 100%
rename from arch/mips/emma2rh/common/Makefile
rename to arch/mips/emma/common/Makefile
diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma/common/irq.c
similarity index 100%
rename from arch/mips/emma2rh/common/irq.c
rename to arch/mips/emma/common/irq.c
diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma/common/irq_emma2rh.c
similarity index 100%
rename from arch/mips/emma2rh/common/irq_emma2rh.c
rename to arch/mips/emma/common/irq_emma2rh.c
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma/common/prom.c
similarity index 100%
rename from arch/mips/emma2rh/common/prom.c
rename to arch/mips/emma/common/prom.c
diff --git a/arch/mips/emma2rh/markeins/Makefile b/arch/mips/emma/markeins/Makefile
similarity index 100%
rename from arch/mips/emma2rh/markeins/Makefile
rename to arch/mips/emma/markeins/Makefile
diff --git a/arch/mips/emma2rh/markeins/irq.c b/arch/mips/emma/markeins/irq.c
similarity index 100%
rename from arch/mips/emma2rh/markeins/irq.c
rename to arch/mips/emma/markeins/irq.c
diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma/markeins/irq_markeins.c
similarity index 100%
rename from arch/mips/emma2rh/markeins/irq_markeins.c
rename to arch/mips/emma/markeins/irq_markeins.c
diff --git a/arch/mips/emma2rh/markeins/led.c b/arch/mips/emma/markeins/led.c
similarity index 100%
rename from arch/mips/emma2rh/markeins/led.c
rename to arch/mips/emma/markeins/led.c
diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma/markeins/platform.c
similarity index 100%
rename from arch/mips/emma2rh/markeins/platform.c
rename to arch/mips/emma/markeins/platform.c
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma/markeins/setup.c
similarity index 100%
rename from arch/mips/emma2rh/markeins/setup.c
rename to arch/mips/emma/markeins/setup.c