diff --git a/[refs] b/[refs]
index a432f64e2ece..d44532f0f357 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e2f350f16f3fc2cb7920ccc202ba5310daed3e
+refs/heads/master: 434bd03509dd07cc6f551c46c3be66bb21030f05
diff --git a/trunk/drivers/staging/omap-thermal/omap-bandgap.c b/trunk/drivers/staging/omap-thermal/omap-bandgap.c
index e8c747efe0d1..8346e3450f83 100644
--- a/trunk/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/trunk/drivers/staging/omap-thermal/omap-bandgap.c
@@ -998,7 +998,7 @@ int omap_bandgap_probe(struct platform_device *pdev)
 }
 
 static
-int __devexit omap_bandgap_remove(struct platform_device *pdev)
+int omap_bandgap_remove(struct platform_device *pdev)
 {
 	struct omap_bandgap *bg_ptr = platform_get_drvdata(pdev);
 	int i;