From af96c777e31ee7002795daa4c4a242a66fbca3b9 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Thu, 28 Jun 2012 20:41:27 +0530 Subject: [PATCH] --- yaml --- r: 319169 b: refs/heads/master c: d790aea70d714c1ba58823b4dc1b445f1e791072 h: refs/heads/master i: 319167: d3981f888ebca0d67efa3034ce55844fb0c225fd v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6d792b9c3311..04aafaa7435b 100644 --- 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 index 9895fa7e486e..b08607606014 100644 --- 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,