summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/mm/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 05:42:30 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 05:42:30 +0200
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /arch/ppc64/mm/Makefile
parentAutomatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 (diff)
parentMerge /spare/repo/linux-2.6/ (diff)
downloadlinux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.tar.xz
linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.zip
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'arch/ppc64/mm/Makefile')
-rw-r--r--arch/ppc64/mm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/mm/Makefile b/arch/ppc64/mm/Makefile
index ac522d57b2a7..3695d00d347f 100644
--- a/arch/ppc64/mm/Makefile
+++ b/arch/ppc64/mm/Makefile
@@ -6,6 +6,6 @@ EXTRA_CFLAGS += -mno-minimal-toc
obj-y := fault.o init.o imalloc.o hash_utils.o hash_low.o tlb.o \
slb_low.o slb.o stab.o mmap.o
-obj-$(CONFIG_DISCONTIGMEM) += numa.o
+obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_PPC_MULTIPLATFORM) += hash_native.o