summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-30 04:30:56 +0300
committerOlof Johansson <olof@lixom.net>2017-01-30 04:30:56 +0300
commitf2d53a8f6e8045ff5978156e41d00d0f7166d0fe (patch)
treebc1e6e02301c8427f7a0935fe0bd37f4005bbd95
parentf0d0b8cb6bb361bd88f10900e9716eec73e262d9 (diff)
parent0ecac9f312f4e974614be5a9f56af2c8e892c897 (diff)
downloadlinux-f2d53a8f6e8045ff5978156e41d00d0f7166d0fe.tar.xz
Merge tag 'hisi-armv7-soc-for-4.11' of git://github.com/hisilicon/linux-hisi into next/soc
ARM: mach-hisi: Hisilicon SoC updates for 4.11 - Drop the declaration of the unimplemented hip01_cpu_die * tag 'hisi-armv7-soc-for-4.11' of git://github.com/hisilicon/linux-hisi: arm: hisi: drop extern hip01_cpu_die Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-hisi/core.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h
index e883583a23f1..c58b68ab0cb6 100644
--- a/arch/arm/mach-hisi/core.h
+++ b/arch/arm/mach-hisi/core.h
@@ -15,5 +15,4 @@ extern void hix5hd2_set_cpu(int cpu, bool enable);
extern void hix5hd2_cpu_die(unsigned int cpu);
extern void hip01_set_cpu(int cpu, bool enable);
-extern void hip01_cpu_die(unsigned int cpu);
#endif