From 70f473d1793db248fab8e88d9362f0831fb940ad Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 19 Feb 2013 22:50:10 +0000 Subject: [PATCH] --- yaml --- r: 358812 b: refs/heads/master c: 0a6d2246790512c88931ddbfedf3fd48e0979093 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-pxa.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 51fbb3767862..bddd3ea00d4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6beaddf243b2d4bbc9165fbd89429fa1a7526af1 +refs/heads/master: 0a6d2246790512c88931ddbfedf3fd48e0979093 diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c index 1034d93fb838..4a79e768a4d8 100644 --- a/trunk/drivers/i2c/busses/i2c-pxa.c +++ b/trunk/drivers/i2c/busses/i2c-pxa.c @@ -1215,7 +1215,7 @@ static int i2c_pxa_probe(struct platform_device *dev) return ret; } -static int __exit i2c_pxa_remove(struct platform_device *dev) +static int i2c_pxa_remove(struct platform_device *dev) { struct pxa_i2c *i2c = platform_get_drvdata(dev); @@ -1269,7 +1269,7 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = { static struct platform_driver i2c_pxa_driver = { .probe = i2c_pxa_probe, - .remove = __exit_p(i2c_pxa_remove), + .remove = i2c_pxa_remove, .driver = { .name = "pxa2xx-i2c", .owner = THIS_MODULE,