diff --git a/[refs] b/[refs]
index cdbf41f1c12c..f450f6b7fd81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d336aa257ba382c3ad7883ee000cbacb761e411
+refs/heads/master: db3185242a9a369d5ef13cd2baf196507925009e
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index b524f5ba78a9..5980f3e886fc 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -290,7 +290,7 @@ config SX
 
 config RIO
 	tristate "Specialix RIO system support"
-	depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && !64BIT
+	depends on SERIAL_NONSTANDARD && !64BIT
 	help
 	  This is a driver for the Specialix RIO, a smart serial card which
 	  drives an outboard box that can support up to 128 ports.  Product
diff --git a/trunk/drivers/char/rio/Makefile b/trunk/drivers/char/rio/Makefile
index bce2bd1204ed..2d1c5a7cba7d 100644
--- a/trunk/drivers/char/rio/Makefile
+++ b/trunk/drivers/char/rio/Makefile
@@ -9,4 +9,4 @@
 obj-$(CONFIG_RIO) += rio.o
 
 rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
-            rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o
+            rioparam.o rioroute.o riotable.o riotty.o
diff --git a/trunk/drivers/char/rio/riopcicopy.c b/trunk/drivers/char/rio/riopcicopy.c
deleted file mode 100644
index 535afaa51ca5..000000000000
--- a/trunk/drivers/char/rio/riopcicopy.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/* Yeah. We have copyright on this one. Sure. */
-
-void rio_pcicopy(char *from, char *to, int amount)
-{
-	while (amount--)
-		*to++ = *from++;
-}