diff --git a/[refs] b/[refs]
index 49becea71cd5..a101ed9e6de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d46f743822ee6e890a6e7971e089a020e6c0000a
+refs/heads/master: 9b96c3124b66a959ba061dbca339944a81686cd2
diff --git a/trunk/drivers/uio/uio_pruss.c b/trunk/drivers/uio/uio_pruss.c
index 098d3d008172..cce0f78341cc 100644
--- a/trunk/drivers/uio/uio_pruss.c
+++ b/trunk/drivers/uio/uio_pruss.c
@@ -209,7 +209,7 @@ static int pruss_probe(struct platform_device *dev)
 	return ret;
 }
 
-static int __devexit pruss_remove(struct platform_device *dev)
+static int pruss_remove(struct platform_device *dev)
 {
 	struct uio_pruss_dev *gdev = platform_get_drvdata(dev);