drivers/base: cpu: fix merge problem

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>