summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/Makefile
diff options
context:
space:
mode:
authorMatt Fleming2009-10-06 23:22:33 +0200
committerPaul Mundt2009-10-10 14:52:34 +0200
commit20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd (patch)
tree7b14d3c6f7004ca86e444c7237a022a143405e7f /arch/sh/mm/Makefile
parentsh: Fix the offset from P1SEG/P2SEG where we map RAM (diff)
downloadkernel-qcow2-linux-20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd.tar.gz
kernel-qcow2-linux-20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd.tar.xz
kernel-qcow2-linux-20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd.zip
sh: Fold fixed-PMB support into dynamic PMB support
The initialisation process differs for CONFIG_PMB and for CONFIG_PMB_FIXED. For CONFIG_PMB_FIXED we need to register the PMB entries that were allocated by the bootloader. Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/Makefile')
-rw-r--r--arch/sh/mm/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 3759bf853293..8a70535fa7ce 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -33,8 +33,7 @@ obj-y += $(tlb-y)
endif
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_PMB) += pmb.o
-obj-$(CONFIG_PMB_FIXED) += pmb-fixed.o
+obj-$(CONFIG_PMB_ENABLE) += pmb.o
obj-$(CONFIG_NUMA) += numa.o
# Special flags for fault_64.o. This puts restrictions on the number of