diff --git a/[refs] b/[refs]
index db11588543b1..5d58dfe2af06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 908002161247e6e68c478052926b62d9a3d72418
+refs/heads/master: e88cd6ff2ce14ed7025d253b7f7f468d38415f77
diff --git a/trunk/drivers/char/hw_random/Kconfig b/trunk/drivers/char/hw_random/Kconfig
index e86dd425a70f..5fab6470f4b2 100644
--- a/trunk/drivers/char/hw_random/Kconfig
+++ b/trunk/drivers/char/hw_random/Kconfig
@@ -22,7 +22,7 @@ config HW_RANDOM
 
 config HW_RANDOM_TIMERIOMEM
 	tristate "Timer IOMEM HW Random Number Generator support"
-	depends on HW_RANDOM
+	depends on HW_RANDOM && HAS_IOMEM
 	---help---
 	  This driver provides kernel-side support for a generic Random
 	  Number Generator used by reading a 'dumb' iomem address that