diff --git a/[refs] b/[refs]
index ea31ae4cd47d..8c05fbb3ce64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b18d5dc8257cb2c47dea2e04168d24aea18d55c0
+refs/heads/master: 37a6520057c98d725be716497ba93b7380c9934f
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 053479339935..e6f31d817d6b 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -527,7 +527,7 @@ static int omap34_xx_bridge_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev)
+static int omap34_xx_bridge_remove(struct platform_device *pdev)
 {
 	dev_t devno;
 	int status = 0;