---

yaml --- r: 319169 b: refs/heads/master c: d790aea h: refs/heads/master i: 319167: d3981f8 v: v3
git-mirror · Jul 12, 2012 · af96c77 · af96c77
1 parent 38f5a3e
commit af96c77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c86d44cda2e715bc95f525fd0eac4bd6a66998e
+refs/heads/master: d790aea70d714c1ba58823b4dc1b445f1e791072
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
@@ -1102,8 +1102,7 @@ omap_i2c_probe(struct platform_device *pdev)
 	return r;
 }
 
-static int
-omap_i2c_remove(struct platform_device *pdev)
+static int __devexit omap_i2c_remove(struct platform_device *pdev)
 {
 	struct omap_i2c_dev	*dev = platform_get_drvdata(pdev);
 	struct resource		*mem;
@@ -1187,7 +1186,7 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
 
 static struct platform_driver omap_i2c_driver = {
 	.probe		= omap_i2c_probe,
-	.remove		= omap_i2c_remove,
+	.remove		= __devexit_p(omap_i2c_remove),
 	.driver		= {
 		.name	= "omap_i2c",
 		.owner	= THIS_MODULE,