diff --git a/[refs] b/[refs] index 185276b77127..d46785bfe6ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdadd54db5e9f05e673eb08746bf2bea460d9f0d +refs/heads/master: 7ba65c7e17a292fe1e6e48fd38d1b1ecb626b586 diff --git a/trunk/include/asm-x86/acpi.h b/trunk/include/asm-x86/acpi.h index c477e5741751..2feb0c494be7 100644 --- a/trunk/include/asm-x86/acpi.h +++ b/trunk/include/asm-x86/acpi.h @@ -158,7 +158,7 @@ extern int acpi_scan_nodes(unsigned long start, unsigned long end); #ifdef CONFIG_X86_64 # define NR_NODE_MEMBLKS (MAX_NUMNODES*2) #endif -extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes, +extern void acpi_fake_nodes(const struct bootnode *fake_nodes, int num_nodes); #else static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,