From 9a206af707e5982a7d0349827a25eb37155044b3 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Mon, 21 Jan 2008 11:01:33 +0100
Subject: [PATCH] --- yaml --- r: 84970 b: refs/heads/master c:
 5062969d77fed23b8ffc1a4124e96e991adaf52c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/cris/Kconfig | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f66403d1a119..92b8bb6dd326 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10f9f9c8570f3656243d2585cbd818ac16dff4f3
+refs/heads/master: 5062969d77fed23b8ffc1a4124e96e991adaf52c
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index 0e9926d71a31..dfddd33c9213 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/arch/cris/Kconfig
@@ -47,9 +47,6 @@ config GENERIC_CALIBRATE_DELAY
 config NO_IOPORT
 	def_bool y
 
-config NO_IOMEM
-	def_bool y
-
 config FORCE_MAX_ZONEORDER
 	int
 	default 6