diff --git a/[refs] b/[refs]
index a64774ee03d2..858763ea46a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38de09a975ec957a616899b11d7bc089071dcb19
+refs/heads/master: 52ec89d34771f3cff3ef7fe0ead2e2d84abb5faf
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 701a11ac676d..e33c64312b25 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -606,7 +606,7 @@ static struct platform_driver bridge_driver = {
 		   .name = "omap-dsp",
 		   },
 	.probe = omap34_xx_bridge_probe,
-	.remove = __devexit_p(omap34_xx_bridge_remove),
+	.remove = omap34_xx_bridge_remove,
 #ifdef CONFIG_PM
 	.suspend = bridge_suspend,
 	.resume = bridge_resume,