git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
mm
/
Makefile
diff --git
a/arch/x86_64/mm/Makefile
b/arch/x86_64/mm/Makefile
index
664f8b7
..
d25ac86
100644
(file)
--- a/
arch/x86_64/mm/Makefile
+++ b/
arch/x86_64/mm/Makefile
@@
-4,7
+4,7
@@
obj-y := init.o fault.o ioremap.o extable.o pageattr.o mmap.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_
DISCONTIGMEM
) += numa.o
+obj-$(CONFIG_
NUMA
) += numa.o
obj-$(CONFIG_K8_NUMA) += k8topology.o
obj-$(CONFIG_ACPI_NUMA) += srat.o