This was done to resolve a conflict in the drivers/base/cpu.c file.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>