diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 10:04:14 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 10:04:14 +0400 |
| commit | 022573c275500e1a50889949f679d04b5446edf6 (patch) | |
| tree | 766ab0e13fc38275466f8544d1bbf4982833cbff /drivers/input/misc/pm8xxx-vibrator.c | |
| parent | 516d798f656614f59553b1ff3592c2c36102b684 (diff) | |
| parent | a455e2985f57e2a71566bb8850094af38b2c932d (diff) | |
| download | linux-022573c275500e1a50889949f679d04b5446edf6.tar.xz | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.8 merge window.
Diffstat (limited to 'drivers/input/misc/pm8xxx-vibrator.c')
| -rw-r--r-- | drivers/input/misc/pm8xxx-vibrator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index dfbfb463ea5d..a9da65e41c5b 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -178,7 +178,7 @@ static int pm8xxx_vib_play_effect(struct input_dev *dev, void *data, return 0; } -static int __devinit pm8xxx_vib_probe(struct platform_device *pdev) +static int pm8xxx_vib_probe(struct platform_device *pdev) { struct pm8xxx_vib *vib; @@ -242,7 +242,7 @@ err_free_mem: return error; } -static int __devexit pm8xxx_vib_remove(struct platform_device *pdev) +static int pm8xxx_vib_remove(struct platform_device *pdev) { struct pm8xxx_vib *vib = platform_get_drvdata(pdev); @@ -270,7 +270,7 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL); static struct platform_driver pm8xxx_vib_driver = { .probe = pm8xxx_vib_probe, - .remove = __devexit_p(pm8xxx_vib_remove), + .remove = pm8xxx_vib_remove, .driver = { .name = "pm8xxx-vib", .owner = THIS_MODULE, |