diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-11 05:28:26 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 05:28:26 +0200 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/mm/Makefile | |
| parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
| parent | [POWERPC] Create add_rtc() function to enable the RTC CMOS driver (diff) | |
| download | linux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.xz linux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/powerpc/mm/Makefile')
| -rw-r--r-- | arch/powerpc/mm/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 4f839c6a9768..7e4d27ad3dee 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -11,8 +11,7 @@ obj-$(CONFIG_PPC32) += init_32.o pgtable_32.o mmu_context_32.o hash-$(CONFIG_PPC_NATIVE) := hash_native_64.o obj-$(CONFIG_PPC64) += init_64.o pgtable_64.o mmu_context_64.o \ hash_utils_64.o hash_low_64.o tlb_64.o \ - slb_low.o slb.o stab.o mmap.o imalloc.o \ - $(hash-y) + slb_low.o slb.o stab.o mmap.o $(hash-y) obj-$(CONFIG_PPC_STD_MMU_32) += ppc_mmu_32.o hash_low_32.o tlb_32.o obj-$(CONFIG_40x) += 4xx_mmu.o obj-$(CONFIG_44x) += 44x_mmu.o |