Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / input / touchscreen / tps6507x-ts.c

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index f7eda3d00fadb46216f09de8eaa9d7c911350d97..820a066c3b8a9f1256b20022fbd910ab4ff33590 100644 (file)
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -345,7 +345,7 @@ err0:
        return error;
 }
 
-static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
+static int tps6507x_ts_remove(struct platform_device *pdev)
 {
        struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
        struct tps6507x_ts *tsc = tps6507x_dev->ts;
@@ -367,7 +367,7 @@ static struct platform_driver tps6507x_ts_driver = {
                .owner = THIS_MODULE,
        },
        .probe = tps6507x_ts_probe,
-       .remove = __devexit_p(tps6507x_ts_remove),
+       .remove = tps6507x_ts_remove,
 };
 module_platform_driver(tps6507x_ts_driver);