diff --git a/[refs] b/[refs]
index 92687316cd5a..d46cfe8ea945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206210ce68c1feb1d9d05839ceacc97ad1b0b324
+refs/heads/master: 9eb26bddfc586da0a9d10646150acb2d120c3890
diff --git a/trunk/drivers/hwspinlock/omap_hwspinlock.c b/trunk/drivers/hwspinlock/omap_hwspinlock.c
index 887d34effb3a..28640b8a81a1 100644
--- a/trunk/drivers/hwspinlock/omap_hwspinlock.c
+++ b/trunk/drivers/hwspinlock/omap_hwspinlock.c
@@ -163,7 +163,7 @@ static int __devexit omap_hwspinlock_remove(struct platform_device *pdev)
 
 static struct platform_driver omap_hwspinlock_driver = {
 	.probe		= omap_hwspinlock_probe,
-	.remove		= __devexit_p(omap_hwspinlock_remove),
+	.remove		= omap_hwspinlock_remove,
 	.driver		= {
 		.name	= "omap_hwspinlock",
 		.owner	= THIS_MODULE,
diff --git a/trunk/drivers/hwspinlock/u8500_hsem.c b/trunk/drivers/hwspinlock/u8500_hsem.c
index 86980fe04117..4039810e06d6 100644
--- a/trunk/drivers/hwspinlock/u8500_hsem.c
+++ b/trunk/drivers/hwspinlock/u8500_hsem.c
@@ -172,7 +172,7 @@ static int __devexit u8500_hsem_remove(struct platform_device *pdev)
 
 static struct platform_driver u8500_hsem_driver = {
 	.probe		= u8500_hsem_probe,
-	.remove		= __devexit_p(u8500_hsem_remove),
+	.remove		= u8500_hsem_remove,
 	.driver		= {
 		.name	= "u8500_hsem",
 		.owner	= THIS_MODULE,