diff --git a/[refs] b/[refs] index 228e3b1cb827..d88721ac72dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4ebc993759dc25dc3db6b6f1a13a23df8264d4b +refs/heads/master: 7e81ab9d3d9a22fb7b20c56f0cabc8ef51954014 diff --git a/trunk/drivers/acpi/numa.c b/trunk/drivers/acpi/numa.c index 4dd0dabe81cb..8fcd6a15517f 100644 --- a/trunk/drivers/acpi/numa.c +++ b/trunk/drivers/acpi/numa.c @@ -228,7 +228,7 @@ int __init acpi_numa_init(void) return 0; } -int __meminit acpi_get_pxm(acpi_handle h) +int acpi_get_pxm(acpi_handle h) { unsigned long pxm; acpi_status status; @@ -246,7 +246,7 @@ int __meminit acpi_get_pxm(acpi_handle h) } EXPORT_SYMBOL(acpi_get_pxm); -int __meminit acpi_get_node(acpi_handle *handle) +int acpi_get_node(acpi_handle *handle) { int pxm, node = -1;