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/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 05b7b8bfaf0..e973133212a 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -241,7 +241,7 @@ static void max8997_haptic_close(struct input_dev *dev)
         max8997_haptic_disable(chip);
 }
 
-static int __devinit max8997_haptic_probe(struct platform_device *pdev)
+static int max8997_haptic_probe(struct platform_device *pdev)
 {
         struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         const struct max8997_platform_data *pdata =
@@ -354,7 +354,7 @@ err_free_mem:
         return error;
 }
 
-static int __devexit max8997_haptic_remove(struct platform_device *pdev)
+static int max8997_haptic_remove(struct platform_device *pdev)
 {
         struct max8997_haptic *chip = platform_get_drvdata(pdev);
 
@@ -396,7 +396,7 @@ static struct platform_driver max8997_haptic_driver = {
                 .pm     = &max8997_haptic_pm_ops,
         },
         .probe          = max8997_haptic_probe,
-        .remove         = __devexit_p(max8997_haptic_remove),
+        .remove         = max8997_haptic_remove,
         .id_table       = max8997_haptic_id,
 };
 module_platform_driver(max8997_haptic_driver);