From 24b131adea1f53f4cee4ef8c3d521ad1786b5368 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 11 Dec 2011 10:04:00 +0000
Subject: [PATCH] --- yaml --- r: 279789 b: refs/heads/master c:
 958cab0fbe13dc89b6f779d495fed283c0e7de5a h: refs/heads/master i:   279787:
 6f62d14c9648fbd419675ab14b1d617806200eee v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/Kconfig             | 5 +++++
 trunk/arch/arm/include/asm/setup.h | 6 +-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 72cf9541ab32..6ab307dc8399 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4244738d20a631cd27fa105a2db71622618ab4e
+refs/heads/master: 958cab0fbe13dc89b6f779d495fed283c0e7de5a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index e084b7e981e8..928cbcc1feca 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1125,6 +1125,11 @@ config ARM_TIMER_SP804
 
 source arch/arm/mm/Kconfig
 
+config ARM_NR_BANKS
+	int
+	default 16 if ARCH_EP93XX
+	default 8
+
 config IWMMXT
 	bool "Enable iWMMXt support"
 	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
diff --git a/trunk/arch/arm/include/asm/setup.h b/trunk/arch/arm/include/asm/setup.h
index 915696dd9c7c..23ebc0c82a39 100644
--- a/trunk/arch/arm/include/asm/setup.h
+++ b/trunk/arch/arm/include/asm/setup.h
@@ -192,11 +192,7 @@ static const struct tagtable __tagtable_##fn __tag = { tag, fn }
 /*
  * Memory map description
  */
-#ifdef CONFIG_ARCH_EP93XX
-# define NR_BANKS 16
-#else
-# define NR_BANKS 8
-#endif
+#define NR_BANKS	CONFIG_ARM_NR_BANKS
 
 struct membank {
 	phys_addr_t start;