Move arch/arm/cpu/armv7/highbank/* -> arch/arm/mach-highbank/*
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Rob Herring robh@kernel.org ---
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/highbank => mach-highbank}/Kconfig | 0 arch/arm/{cpu/armv7/highbank => mach-highbank}/Makefile | 0 arch/arm/{cpu/armv7/highbank => mach-highbank}/timer.c | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/Kconfig (100%) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/Makefile (100%) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/timer.c (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2bae41a..de56ddf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -690,7 +690,7 @@ source "arch/arm/mach-davinci/Kconfig"
source "arch/arm/cpu/armv7/exynos/Kconfig"
-source "arch/arm/cpu/armv7/highbank/Kconfig" +source "arch/arm/mach-highbank/Kconfig"
source "arch/arm/cpu/armv7/keystone/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ee25e48..7592e20 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -6,6 +6,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci +machine-$(CONFIG_ARCH_HIGHBANK) += highbank # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 254ca3d..7c63af9 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -43,7 +43,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ obj-$(CONFIG_ARCH_EXYNOS) += exynos/ -obj-$(CONFIG_ARCH_HIGHBANK) += highbank/ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/ diff --git a/arch/arm/cpu/armv7/highbank/Kconfig b/arch/arm/mach-highbank/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/highbank/Kconfig rename to arch/arm/mach-highbank/Kconfig diff --git a/arch/arm/cpu/armv7/highbank/Makefile b/arch/arm/mach-highbank/Makefile similarity index 100% rename from arch/arm/cpu/armv7/highbank/Makefile rename to arch/arm/mach-highbank/Makefile diff --git a/arch/arm/cpu/armv7/highbank/timer.c b/arch/arm/mach-highbank/timer.c similarity index 100% rename from arch/arm/cpu/armv7/highbank/timer.c rename to arch/arm/mach-highbank/timer.c