diff --git a/[refs] b/[refs]
index a478c8639de1..c48eaf9cb5ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6299afc40c8612a87358ecea80882395fe67111f
+refs/heads/master: 997183dc2a8992374d93e66f5ea0d58fa1022a47
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 8a835eb58808..8edb6936fb9b 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -1145,7 +1145,7 @@ config IBMVETH
 	  be called ibmveth.
 
 config IBM_EMAC
-	tristate "IBM PPC4xx EMAC driver support"
+	bool "IBM PPC4xx EMAC driver support"
 	depends on 4xx
 	select CRC32
 	---help---
@@ -1154,7 +1154,7 @@ config IBM_EMAC
 
 config IBM_EMAC_ERRMSG
 	bool "Verbose error messages"
-	depends on IBM_EMAC
+	depends on IBM_EMAC && BROKEN
 
 config IBM_EMAC_RXB
 	int "Number of receive buffers"