From 8b555f50bec5f62a2079162f858a469a25c68ffa Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 19 Nov 2009 11:30:30 +0100
Subject: [PATCH] --- yaml --- r: 172378 b: refs/heads/master c:
 394168389c5770accf1d255fdfe45846ec121585 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/arm/mm/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9874997163a0..85cff2815797 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43149c168ce4069ce8828b1ceb8f7eb42bc4b82
+refs/heads/master: 394168389c5770accf1d255fdfe45846ec121585
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index e993140edd88..9cf7706e0be0 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -777,5 +777,5 @@ config CACHE_XSC3L2
 
 config ARM_L1_CACHE_SHIFT
 	int
-	default 6 if ARCH_OMAP3
+	default 6 if ARCH_OMAP3 || ARCH_S5PC1XX
 	default 5