diff options
| author | Bob Picco <bob.picco@hp.com> | 2005-10-04 21:13:37 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-04 22:19:30 +0200 |
| commit | da9577c531f17f744f3eab40f700e07933d26361 (patch) | |
| tree | 388e426b9d387b5297b44a519d60bc9f093935d6 /arch/ia64/mm | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 (diff) | |
| download | linux-da9577c531f17f744f3eab40f700e07933d26361.tar.xz linux-da9577c531f17f744f3eab40f700e07933d26361.zip | |
[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')
| -rw-r--r-- | arch/ia64/mm/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/mm/Makefile b/arch/ia64/mm/Makefile index 7078f67887ec..d78d20f0a0f0 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 |