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"