diff --git a/[refs] b/[refs]
index 96b5ba795330..747fd4b4888b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7a6cac204147634aba7487e4d618b028ff54c0d
+refs/heads/master: ebede60741e2cec6d210f137fd22a30e37abc0be
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index 7333b41d4224..d6adc2614f69 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -175,7 +175,7 @@ config MOXA_INTELLIO
 
 config MOXA_SMARTIO
 	tristate "Moxa SmartIO support"
-	depends on SERIAL_NONSTANDARD
+	depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
 	help
 	  Say Y here if you have a Moxa SmartIO multiport serial card.