diff --git a/[refs] b/[refs]
index 714b5129a8a4..a28415590160 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5981d644209c38029df7f91eb8c61bc5952f182b
+refs/heads/master: f8dd49fa054814f365fcff8d72ca47e8afda9743
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index 42734d3bf3b9..7333b41d4224 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -896,8 +896,8 @@ source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE
 	tristate "ACP Modem (Mwave) support"
-	depends on X86 && BROKEN
-	select SERIAL_8250 # PLEASE DO NOT DO THIS - move this driver to drivers/serial
+	depends on X86
+	select SERIAL_8250
 	---help---
 	  The ACP modem (Mwave) for Linux is a WinModem. It is composed of a
 	  kernel driver and a user level application. Together these components