aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/mm/Makefile
diff options
context:
space:
mode:
authorBob Picco <bob.picco@hp.com>2005-10-04 15:13:37 -0400
committerTony Luck <tony.luck@intel.com>2005-10-04 13:19:30 -0700
commitda9577c531f17f744f3eab40f700e07933d26361 (patch)
tree388e426b9d387b5297b44a519d60bc9f093935d6 /arch/ia64/mm/Makefile
parentdd7205ed0f022a2a5e60eb7404e6c9f49d2301c3 (diff)
downloadlinux-2.6.38-lt-ux500-da9577c531f17f744f3eab40f700e07933d26361.tar.gz
[PATCH] V5 ia64 SPARSEMEM - Kconfig and Makefile
The patch modifies the Kconfig file to introduce the new memory model options and other related SPARSEMEM changes. There is also a minor change in the Makefile. Signed-off-by: Bob Picco <bob.picco@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/Makefile')
-rw-r--r--arch/ia64/mm/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/mm/Makefile b/arch/ia64/mm/Makefile
index 7078f67887e..d78d20f0a0f 100644
--- a/arch/ia64/mm/Makefile
+++ b/arch/ia64/mm/Makefile
@@ -7,6 +7,5 @@ obj-y := init.o fault.o tlb.o extable.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_DISCONTIGMEM) += discontig.o
-ifndef CONFIG_DISCONTIGMEM
-obj-y += contig.o
-endif
+obj-$(CONFIG_SPARSEMEM) += discontig.o
+obj-$(CONFIG_FLATMEM) += contig.o