diff --git a/[refs] b/[refs] index 0b716df779a5..245ef619eaf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22aecebfd9498c4779e5c5bed1d2d054bd99f7a4 +refs/heads/master: 941b10fab2cbd90ac7ad6bc2338ffe30e1d3ce53 diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c index c567b46dfa0f..ec742a4e5635 100644 --- a/trunk/drivers/acpi/processor_core.c +++ b/trunk/drivers/acpi/processor_core.c @@ -770,7 +770,7 @@ static struct notifier_block acpi_cpu_notifier = .notifier_call = acpi_cpu_soft_notify, }; -static int acpi_processor_add(struct acpi_device *device) +static int __cpuinit acpi_processor_add(struct acpi_device *device) { struct acpi_processor *pr = NULL; int result = 0;