From: Chris Zankel <czankel@tensilica.com>
Date: Thu, 30 Jun 2005 09:58:58 +0000 (-0700)
Subject: [PATCH] xtensa: Added mm/Kconfig to get a flat memory layout
X-Git-Tag: v2.6.13-rc2~48
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82300bf479d7cdf87214b81ca5dc003bbc4f7e8f;p=linux-2.6

[PATCH] xtensa: Added mm/Kconfig to get a flat memory layout

Added 'mm/Kconfig' to the xtensa Kconfig file to get a flat memory layout.
Fixed a typo in one of the help texts (thanks Geert for pointing it out)

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 3e89767cea..c9b5d298e3 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -132,7 +132,7 @@ config XTENSA_CPU_CLOCK
 config GENERIC_CALIBRATE_DELAY
 	bool "Auto calibration of the BogoMIPS value"
 	---help---
-	  The BogoMIPS value can easily derived from the CPU frequency.
+	  The BogoMIPS value can easily be derived from the CPU frequency.
 
 config CMDLINE_BOOL
 	bool "Default bootloader kernel arguments"
@@ -158,6 +158,8 @@ config XTENSA_ISS_NETWORK
 	depends on XTENSA_PLATFORM_ISS
 	default y
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "Bus options"