summaryrefslogtreecommitdiff
path: root/arch/frv/mm/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-09 14:12:06 +0400
committerPaul Mackerras <paulus@samba.org>2008-05-09 14:12:06 +0400
commit2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch)
treeb2306840f227972a7c9d4a2b75e516fe81358ce8 /arch/frv/mm/Makefile
parent02539d71fa98d5737bb668b02286c76241e4bac9 (diff)
parent78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff)
downloadlinux-2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92.tar.xz
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/frv/mm/Makefile')
-rw-r--r--arch/frv/mm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mm/Makefile b/arch/frv/mm/Makefile
index fb8b1d860f46..1bca5ab8a6ab 100644
--- a/arch/frv/mm/Makefile
+++ b/arch/frv/mm/Makefile
@@ -6,4 +6,4 @@ obj-y := init.o kmap.o
obj-$(CONFIG_MMU) += \
pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \
- mmu-context.o dma-alloc.o unaligned.o elf-fdpic.o
+ mmu-context.o dma-alloc.o elf-fdpic.o