commit b9588c1372b57a22c0509c5bbe0bea3b9734021b
author Ryan Harkin <ryan.harkin@linaro.org> Tue Apr 14 17:03:34 2015 +0100
committer Alex Shi <alex.shi@linaro.org> Wed Apr 15 17:04:04 2015 +0800
tree 052ab037fe9234f30d9ae9a1c1f457d368180a3c
parent 726b4e0f4c9ba4e123fdd3414b1f4e3f4e36b0c0

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>

drivers/base/cpu.c

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ac292ee..607efe6 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -319,7 +319,7 @@
 	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);