From d4796ef7bd8c769530ab522d4748a01e48040f47 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 24 Sep 2008 14:58:54 +0900
Subject: [PATCH] --- yaml --- r: 110069 b: refs/heads/master c:
 1b20b093e7f81ff8cb322773684b260d1487b610 h: refs/heads/master i:   110067:
 587059a6426b3a9ee8ffc3d2964f5f9f8e1d4990 v: v3

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

diff --git a/[refs] b/[refs]
index 68cdf621ff6a..e61836bd10a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1575da9ee4804ca889f32f8567dd7965e6fe4abc
+refs/heads/master: 1b20b093e7f81ff8cb322773684b260d1487b610
diff --git a/trunk/arch/m32r/Kconfig b/trunk/arch/m32r/Kconfig
index 0266519491a4..f57113f1f892 100644
--- a/trunk/arch/m32r/Kconfig
+++ b/trunk/arch/m32r/Kconfig
@@ -406,11 +406,7 @@ config PCI_DIRECT
 source "drivers/pci/Kconfig"
 
 config ISA
-	bool "ISA support"
-	help
-	  Find out whether you have ISA slots on your motherboard.  ISA is the
-	  name of a bus system, i.e. the way the CPU talks to the other stuff
-	  inside your box.  If you have ISA, say Y, otherwise N.
+	bool
 
 source "drivers/pcmcia/Kconfig"