diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
| commit | 0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch) | |
| tree | 1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /drivers/input/misc/pcspkr.c | |
| parent | 0c3e99437a66e4c869c60c2398449e6d98f3a988 (diff) | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'drivers/input/misc/pcspkr.c')
| -rw-r--r-- | drivers/input/misc/pcspkr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c index 674a2cfc3c0e..72b1fc3ab910 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c | |||
| @@ -125,7 +125,6 @@ static const struct dev_pm_ops pcspkr_pm_ops = { | |||
| 125 | static struct platform_driver pcspkr_platform_driver = { | 125 | static struct platform_driver pcspkr_platform_driver = { |
| 126 | .driver = { | 126 | .driver = { |
| 127 | .name = "pcspkr", | 127 | .name = "pcspkr", |
| 128 | .owner = THIS_MODULE, | ||
| 129 | .pm = &pcspkr_pm_ops, | 128 | .pm = &pcspkr_pm_ops, |
| 130 | }, | 129 | }, |
| 131 | .probe = pcspkr_probe, | 130 | .probe = pcspkr_probe, |