diff --git a/[refs] b/[refs]
index c5d5753ea3d4..9e2e07d9a67e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cbe17701a0379c7b05a79a6df4f24e41d2afde8
+refs/heads/master: b7e5d1f04104d98895945ecb463d750320dcd6cf
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index f09fc0e2062d..7cfcc629a7fd 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -1123,6 +1123,7 @@ source "drivers/s390/char/Kconfig"
 
 config RAMOOPS
 	tristate "Log panic/oops to a RAM buffer"
+	depends on HAS_IOMEM
 	default n
 	help
 	  This enables panic and oops messages to be logged to a circular