Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / arch / sh / mm / Makefile

diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 3ffd7f68c0a206befbcc7ca3f1a940a73027dfb2..4061e89d84d09fff645297747e28482f5364a76b 100644 (file)
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -8,10 +8,9 @@ obj-$(CONFIG_CPU_SH2)  += cache-sh2.o
 obj-$(CONFIG_CPU_SH3)  += cache-sh3.o
 obj-$(CONFIG_CPU_SH4)  += cache-sh4.o
 
-obj-$(CONFIG_DMA_PAGE_OPS)     += pg-dma.o
-obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
-
-mmu-y                  := fault-nommu.o tlb-nommu.o pg-nommu.o
+mmu-y                  := tlb-nommu.o pg-nommu.o
+mmu-$(CONFIG_CPU_SH3)  += fault-nommu.o
+mmu-$(CONFIG_CPU_SH4)  += fault-nommu.o
 mmu-$(CONFIG_MMU)      := fault.o clear_page.o copy_page.o tlb-flush.o \
                           ioremap.o
 
@@ -27,5 +26,7 @@ obj-$(CONFIG_CPU_SH4)         += tlb-sh4.o pg-sh4.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
 endif
 
+obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
 obj-$(CONFIG_SH7705_CACHE_32KB)        += cache-sh7705.o
 obj-$(CONFIG_32BIT)            += pmb.o
+obj-$(CONFIG_NUMA)             += numa.o