1 files changed, 6 insertions, 5 deletions

diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 4061e89d84d0..e73d7f970ce0 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -4,9 +4,10 @@
 
 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
+cache-$(CONFIG_CPU_SH2)         := cache-sh2.o
+cache-$(CONFIG_CPU_SH3)         := cache-sh3.o
+cache-$(CONFIG_CPU_SH4)         := cache-sh4.o pg-sh4.o
+cache-$(CONFIG_CACHE_OFF)       :=
 
 mmu-y                   := tlb-nommu.o pg-nommu.o
 mmu-$(CONFIG_CPU_SH3)   += fault-nommu.o
@@ -14,7 +15,7 @@ mmu-$(CONFIG_CPU_SH4)	+= fault-nommu.o
 mmu-$(CONFIG_MMU)       := fault.o clear_page.o copy_page.o tlb-flush.o \
                            ioremap.o
 
-obj-y                   += $(mmu-y)
+obj-y                   += $(cache-y) $(mmu-y)
 
 ifdef CONFIG_DEBUG_FS
 obj-$(CONFIG_CPU_SH4)           += cache-debugfs.o
@@ -22,7 +23,7 @@ endif
 
 ifdef CONFIG_MMU
 obj-$(CONFIG_CPU_SH3)           += tlb-sh3.o
-obj-$(CONFIG_CPU_SH4)           += tlb-sh4.o pg-sh4.o
+obj-$(CONFIG_CPU_SH4)           += tlb-sh4.o
 obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
 endif