summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorHaojian Zhuang2013-12-20 03:52:56 +0100
committerKevin Hilman2013-12-20 17:23:01 +0100
commit389ee0c2ffedf5819dccc2c67dd15757c4550765 (patch)
tree6b59caa70e41a290b8957d5383fe2b22ebee31a6 /arch/arm/Kconfig
parentARM: dts: enable clock binding on Hi3620 (diff)
downloadkernel-qcow2-linux-389ee0c2ffedf5819dccc2c67dd15757c4550765.tar.gz
kernel-qcow2-linux-389ee0c2ffedf5819dccc2c67dd15757c4550765.tar.xz
kernel-qcow2-linux-389ee0c2ffedf5819dccc2c67dd15757c4550765.zip
ARM: hisi: rename hi3xxx to hisi
Since some new Hisilicon SoCs are not named as hi3xxx, rename mach-hi3xxx to mach-hisi instead. And the pronounciation of "hisi" is similar to the chinese pronounciation of Hisilicon. So Hisilicon guys like this name. ARCH_HI3xxx will be renamed later since other drivers are using it and they are still in linux-next git tree. So rename ARCH_HI3xxx later. Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 75eb5323fedd..b7662dfcd847 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -925,10 +925,10 @@ source "arch/arm/mach-footbridge/Kconfig"
source "arch/arm/mach-gemini/Kconfig"
-source "arch/arm/mach-hi3xxx/Kconfig"
-
source "arch/arm/mach-highbank/Kconfig"
+source "arch/arm/mach-hisi/Kconfig"
+
source "arch/arm/mach-integrator/Kconfig"
source "arch/arm/mach-iop32x/Kconfig"