From 934749f05f6735fa078d0f36e600009fae4438fa Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 31 Jul 2007 18:52:12 +0900
Subject: [PATCH] --- yaml --- r: 68191 b: refs/heads/master c:
 ac38e4d33d8da3c3c402d2b4858d107273287f43 h: refs/heads/master i:   68189:
 45f7dc2f9e1aa7ddf8bebe2daa76ad92b76763dd   68187:
 7d1cbce3a0a753ad152407ebfb300552dfa9c9cc   68183:
 8fc8d0425caf5dfe08dcfcd0480a139ab46361df   68175:
 a5f5b9cc929f1fcd847ce688ec8c94d00ebf291a   68159:
 ef5704c6bf2c1389a6c98f39188aafd307917268 v: v3

---
 [refs]                    |  2 +-
 trunk/arch/sh/mm/Makefile | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index bb9ec26d9140..8620c51e1fd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9d03d9a80c4bcc571efd93fe80ed40973030422
+refs/heads/master: ac38e4d33d8da3c3c402d2b4858d107273287f43
diff --git a/trunk/arch/sh/mm/Makefile b/trunk/arch/sh/mm/Makefile
index e73d7f970ce0..6fbca50b64b4 100644
--- a/trunk/arch/sh/mm/Makefile
+++ b/trunk/arch/sh/mm/Makefile
@@ -4,10 +4,12 @@
 
 obj-y			:= init.o extable.o consistent.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)	:=
+ifndef CONFIG_CACHE_OFF
+obj-$(CONFIG_CPU_SH2)		+= cache-sh2.o
+obj-$(CONFIG_CPU_SH3)		+= cache-sh3.o
+obj-$(CONFIG_CPU_SH4)		+= cache-sh4.o
+obj-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o
+endif
 
 mmu-y			:= tlb-nommu.o pg-nommu.o
 mmu-$(CONFIG_CPU_SH3)	+= fault-nommu.o
@@ -15,19 +17,21 @@ 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			+= $(cache-y) $(mmu-y)
+obj-y			+= $(mmu-y)
 
 ifdef CONFIG_DEBUG_FS
-obj-$(CONFIG_CPU_SH4)		+= cache-debugfs.o
+obj-$(CONFIG_CPU_SH4)	+= cache-debugfs.o
 endif
 
 ifdef CONFIG_MMU
-obj-$(CONFIG_CPU_SH3)		+= tlb-sh3.o
-obj-$(CONFIG_CPU_SH4)		+= tlb-sh4.o
-obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
+obj-$(CONFIG_CPU_SH3)	+= tlb-sh3.o
+obj-$(CONFIG_CPU_SH4)	+= tlb-sh4.o
+ifndef CONFIG_CACHE_OFF
+obj-$(CONFIG_CPU_SH4)		+= pg-sh4.o
+obj-$(CONFIG_SH7705_CACHE_32KB)	+= pg-sh7705.o
+endif
 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