summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-mvebu/include/mach/config.h (renamed from arch/arm/include/asm/arch-armada-xp/config.h)0
-rw-r--r--arch/arm/mach-mvebu/include/mach/cpu.h (renamed from arch/arm/include/asm/arch-armada-xp/cpu.h)0
-rw-r--r--arch/arm/mach-mvebu/include/mach/soc.h (renamed from arch/arm/include/asm/arch-armada-xp/soc.h)0
4 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2a4f84b84af..63ed3214f65 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -86,7 +86,7 @@ libs-y += arch/arm/imx-common/
endif
endif
-ifneq (,$(filter $(SOC), armada-xp kirkwood))
+ifneq (,$(filter $(SOC), mvebu kirkwood))
libs-y += arch/arm/mvebu-common/
endif
diff --git a/arch/arm/include/asm/arch-armada-xp/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index f9fd4246099..f9fd4246099 100644
--- a/arch/arm/include/asm/arch-armada-xp/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
diff --git a/arch/arm/include/asm/arch-armada-xp/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
index 4f5ff96d844..4f5ff96d844 100644
--- a/arch/arm/include/asm/arch-armada-xp/cpu.h
+++ b/arch/arm/mach-mvebu/include/mach/cpu.h
diff --git a/arch/arm/include/asm/arch-armada-xp/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 963e7ac5b76..963e7ac5b76 100644
--- a/arch/arm/include/asm/arch-armada-xp/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h