projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/max98088' into asoc-linus
[cascardo/linux.git]
/
drivers
/
xen
/
xen-acpi-cpuhotplug.c
diff --git
a/drivers/xen/xen-acpi-cpuhotplug.c
b/drivers/xen/xen-acpi-cpuhotplug.c
index
0caf486
..
8dae6c1
100644
(file)
--- a/
drivers/xen/xen-acpi-cpuhotplug.c
+++ b/
drivers/xen/xen-acpi-cpuhotplug.c
@@
-91,7
+91,7
@@
static int xen_acpi_processor_enable(struct acpi_device *device)
return 0;
}
-static int
__cpuinit
xen_acpi_processor_add(struct acpi_device *device)
+static int xen_acpi_processor_add(struct acpi_device *device)
{
int ret;
struct acpi_processor *pr;