From: Ryan Harkin <ryan.harkin@linaro.org>
Date: Tue, 14 Apr 2015 16:03:34 +0000 (+0100)
Subject: drivers/base: cpu: fix merge problem
X-Git-Tag: firefly_0821_release~3680^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9588c1372b57a22c0509c5bbe0bea3b9734021b;p=firefly-linux-kernel-4.4.55.git

drivers/base: cpu: fix merge problem

In LSK's linux-linaro-lsk-android branch, this merge

bb0dddf6157bc679de9143507375fce3f13fcd00

broke drivers/base/cpu.c

Because this patch appears twice:
197028d  2014-02-08  cpu: add generic support for CPU feature based
module autoloading  [Ard Biesheuvel]
126ef42  2014-02-08  cpu: add generic support for CPU feature based
module autoloading  [Ard Biesheuvel]

And the merge edited the file to the old contents.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
---

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ac292eee83d6..607efe6b7dc8 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -319,7 +319,7 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
 	cpu->dev.id = num;
 	cpu->dev.bus = &cpu_subsys;
 	cpu->dev.release = cpu_device_release;
-#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
+#ifdef CONFIG_HAVE_CPU_AUTOPROBE
 	cpu->dev.bus->uevent = cpu_uevent;
 #endif
 	error = device_register(&cpu->dev);