projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timer/cleanup' into late/mvebu2
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
ia64
/
include
/
asm
/
acpi.h
diff --git
a/arch/ia64/include/asm/acpi.h
b/arch/ia64/include/asm/acpi.h
index 301609c3fceca4099201c06ef2b4992f7a29fff2..359e68a03ca3e47ca1ea71df04b3fd04cba14e31 100644
(file)
--- a/
arch/ia64/include/asm/acpi.h
+++ b/
arch/ia64/include/asm/acpi.h
@@
-153,7
+153,7
@@
extern int additional_cpus;
#else
#define MAX_PXM_DOMAINS (256)
#endif
-extern int
__devinitdata
pxm_to_nid_map[MAX_PXM_DOMAINS];
+extern int pxm_to_nid_map[MAX_PXM_DOMAINS];
extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
#endif