Merge branch 'next' into for-linus

Prepare first set of updates for 3.8 merge window.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index db49abf056b..606da5bd611 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -110,7 +110,7 @@ static const struct ad7879_bus_ops ad7879_spi_bus_ops = {
         .write          = ad7879_spi_write,
 };
 
-static int __devinit ad7879_spi_probe(struct spi_device *spi)
+static int ad7879_spi_probe(struct spi_device *spi)
 {
         struct ad7879 *ts;
         int err;
@@ -137,7 +137,7 @@ static int __devinit ad7879_spi_probe(struct spi_device *spi)
         return 0;
 }
 
-static int __devexit ad7879_spi_remove(struct spi_device *spi)
+static int ad7879_spi_remove(struct spi_device *spi)
 {
         struct ad7879 *ts = spi_get_drvdata(spi);
 
@@ -154,7 +154,7 @@ static struct spi_driver ad7879_spi_driver = {
                 .pm     = &ad7879_pm_ops,
         },
         .probe          = ad7879_spi_probe,
-        .remove         = __devexit_p(ad7879_spi_remove),
+        .remove         = ad7879_spi_remove,
 };
 
 module_spi_driver(ad7879_spi_driver);