diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/x86/mm/Makefile | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/x86/mm/Makefile')
| -rw-r--r-- | arch/x86/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 59f89b434b45..fea4565ff576 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ | 1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ |
| 2 | pat.o pgtable.o gup.o | 2 | pat.o pgtable.o gup.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_X86_32) += pgtable_32.o | 4 | obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o |
| 5 | 5 | ||
| 6 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o | 6 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
| 7 | obj-$(CONFIG_X86_PTDUMP) += dump_pagetables.o | 7 | obj-$(CONFIG_X86_PTDUMP) += dump_pagetables.o |