diff options
| -rw-r--r-- | arch/mips/Makefile | 6 | ||||
| -rw-r--r-- | arch/mips/emma/common/Makefile (renamed from arch/mips/emma2rh/common/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/common/irq.c (renamed from arch/mips/emma2rh/common/irq.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/common/irq_emma2rh.c (renamed from arch/mips/emma2rh/common/irq_emma2rh.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/common/prom.c (renamed from arch/mips/emma2rh/common/prom.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/Makefile (renamed from arch/mips/emma2rh/markeins/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/irq.c (renamed from arch/mips/emma2rh/markeins/irq.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/irq_markeins.c (renamed from arch/mips/emma2rh/markeins/irq_markeins.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/led.c (renamed from arch/mips/emma2rh/markeins/led.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/platform.c (renamed from arch/mips/emma2rh/markeins/platform.c) | 0 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/setup.c (renamed from arch/mips/emma2rh/markeins/setup.c) | 0 |
11 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 041c4f2e088a..28c55f608913 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 index cb0fd328c61f..cb0fd328c61f 100644 --- a/arch/mips/emma2rh/common/Makefile +++ b/arch/mips/emma/common/Makefile diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma/common/irq.c index 91cbd959ab67..91cbd959ab67 100644 --- a/arch/mips/emma2rh/common/irq.c +++ b/arch/mips/emma/common/irq.c diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma/common/irq_emma2rh.c index 96df37b77759..96df37b77759 100644 --- a/arch/mips/emma2rh/common/irq_emma2rh.c +++ b/arch/mips/emma/common/irq_emma2rh.c diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma/common/prom.c index 97bf29e755a0..97bf29e755a0 100644 --- a/arch/mips/emma2rh/common/prom.c +++ b/arch/mips/emma/common/prom.c diff --git a/arch/mips/emma2rh/markeins/Makefile b/arch/mips/emma/markeins/Makefile index 3c8b864f7bc5..3c8b864f7bc5 100644 --- a/arch/mips/emma2rh/markeins/Makefile +++ b/arch/mips/emma/markeins/Makefile diff --git a/arch/mips/emma2rh/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 6bcf6a06367a..6bcf6a06367a 100644 --- a/arch/mips/emma2rh/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma/markeins/irq_markeins.c index fba5c156f472..fba5c156f472 100644 --- a/arch/mips/emma2rh/markeins/irq_markeins.c +++ b/arch/mips/emma/markeins/irq_markeins.c diff --git a/arch/mips/emma2rh/markeins/led.c b/arch/mips/emma/markeins/led.c index b65254c1bfe9..b65254c1bfe9 100644 --- a/arch/mips/emma2rh/markeins/led.c +++ b/arch/mips/emma/markeins/led.c diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma/markeins/platform.c index fb9cda253ab0..fb9cda253ab0 100644 --- a/arch/mips/emma2rh/markeins/platform.c +++ b/arch/mips/emma/markeins/platform.c diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma/markeins/setup.c index b6a23ad539f8..b6a23ad539f8 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma/markeins/setup.c |