diff --git a/[refs] b/[refs]
index 87d785c3ebfb..829680bedd70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fec37ab56f5b86b413f71258f36b181f57180d9c
+refs/heads/master: 0cf08dcb78e8d61b6d4b2eb5cdb296d969971626
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 01f282cd0989..dd145c1714a4 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -1725,6 +1725,7 @@ config TLAN
 
 config KS8842
 	tristate "Micrel KSZ8842"
+	depends on HAS_IOMEM
 	help
 	  This platform driver is for Micrel KSZ8842 chip.