sh: __addr_ok() and other misc nommu fixups.

A few more outstanding nommu fixups..

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index f25903aa607b..bed697c0dc19 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -194,7 +194,7 @@ config MEMORY_SIZE
 
 config 32BIT
         bool "Support 32-bit physical addressing through PMB"
-        depends on CPU_SH4A
+        depends on CPU_SH4A && MMU
         default y
         help
           If you say Y here, physical addressing will be extended to
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 87a7c07265c0..da37d86e65eb 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -6,7 +6,7 @@ obj-y			:= init.o extable.o consistent.o
 
 obj-$(CONFIG_CPU_SH2)   += cache-sh2.o
 obj-$(CONFIG_CPU_SH3)   += cache-sh3.o
-obj-$(CONFIG_CPU_SH4)   += cache-sh4.o pg-sh4.o
+obj-$(CONFIG_CPU_SH4)   += cache-sh4.o
 
 obj-$(CONFIG_DMA_PAGE_OPS)      += pg-dma.o
 obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
@@ -19,7 +19,7 @@ obj-y			+= $(mmu-y)
 
 ifdef CONFIG_MMU
 obj-$(CONFIG_CPU_SH3)           += tlb-sh3.o
-obj-$(CONFIG_CPU_SH4)           += tlb-sh4.o
+obj-$(CONFIG_CPU_SH4)           += tlb-sh4.o pg-sh4.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
 endif