projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpi-tables'
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
acpi.h
diff --git
a/arch/x86/include/asm/acpi.h
b/arch/x86/include/asm/acpi.h
index
c24c070
..
5391b0a
100644
(file)
--- a/
arch/x86/include/asm/acpi.h
+++ b/
arch/x86/include/asm/acpi.h
@@
-145,7
+145,6
@@
static inline void disable_acpi(void) { }
#define ARCH_HAS_POWER_INIT 1
#ifdef CONFIG_ACPI_NUMA
-extern int acpi_numa;
extern int x86_acpi_numa_init(void);
#endif /* CONFIG_ACPI_NUMA */