From 9a547ef3ec82707979b2fc281c568f711fc7b550 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 27 Oct 2010 17:28:41 +0100
Subject: [PATCH] --- yaml --- r: 218711 b: refs/heads/master c:
 0bc42d7fcb0acaab4202db97ff2de475424bf9b4 h: refs/heads/master i:   218709:
 3302b88198f7cff83eba898ad5e23a4c2ad522e2   218707:
 05a20429302fa90fbf285f33f0e0860dae27c0fd   218703:
 c20cf45369ee2cfa0c0e35930c571f599e6e9dc8 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/mn10300/Kconfig          | 29 +-------------------------
 trunk/arch/mn10300/mm/Kconfig.cache | 32 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 trunk/arch/mn10300/mm/Kconfig.cache

diff --git a/[refs] b/[refs]
index 18a7a7c4afeb..5ba3a873e9db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c0f935c1eee1d778b43895f80c9d27a896dfd9
+refs/heads/master: 0bc42d7fcb0acaab4202db97ff2de475424bf9b4
diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig
index eab0c2aa95cd..069e34d4c4ac 100644
--- a/trunk/arch/mn10300/Kconfig
+++ b/trunk/arch/mn10300/Kconfig
@@ -136,34 +136,7 @@ config FPU
 	default y
 	depends on MN10300_PROC_MN103E010
 
-choice
-	prompt "CPU Caching mode"
-	default MN10300_CACHE_WBACK
-	help
-	  This option determines the caching mode for the kernel.
-
-	  Write-Back caching mode involves the all reads and writes causing
-	  the affected cacheline to be read into the cache first before being
-	  operated upon. Memory is not then updated by a write until the cache
-	  is filled and a cacheline needs to be displaced from the cache to
-	  make room. Only at that point is it written back.
-
-	  Write-Through caching only fetches cachelines from memory on a
-	  read. Writes always get written directly to memory. If the affected
-	  cacheline is also in cache, it will be updated too.
-
-	  The final option is to turn of caching entirely.
-
-config MN10300_CACHE_WBACK
-	bool "Write-Back"
-
-config MN10300_CACHE_WTHRU
-	bool "Write-Through"
-
-config MN10300_CACHE_DISABLED
-	bool "Disabled"
-
-endchoice
+source "arch/mn10300/mm/Kconfig.cache"
 
 menu "Memory layout options"
 
diff --git a/trunk/arch/mn10300/mm/Kconfig.cache b/trunk/arch/mn10300/mm/Kconfig.cache
new file mode 100644
index 000000000000..f5599f47ec15
--- /dev/null
+++ b/trunk/arch/mn10300/mm/Kconfig.cache
@@ -0,0 +1,32 @@
+#
+# MN10300 CPU cache options
+#
+
+choice
+	prompt "CPU Caching mode"
+	default MN10300_CACHE_WBACK
+	help
+	  This option determines the caching mode for the kernel.
+
+	  Write-Back caching mode involves the all reads and writes causing
+	  the affected cacheline to be read into the cache first before being
+	  operated upon. Memory is not then updated by a write until the cache
+	  is filled and a cacheline needs to be displaced from the cache to
+	  make room. Only at that point is it written back.
+
+	  Write-Through caching only fetches cachelines from memory on a
+	  read. Writes always get written directly to memory. If the affected
+	  cacheline is also in cache, it will be updated too.
+
+	  The final option is to turn of caching entirely.
+
+config MN10300_CACHE_WBACK
+	bool "Write-Back"
+
+config MN10300_CACHE_WTHRU
+	bool "Write-Through"
+
+config MN10300_CACHE_DISABLED
+	bool "Disabled"
+
+endchoice