diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /drivers/input/misc/soc_button_array.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'drivers/input/misc/soc_button_array.c')
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index e097f1ab427f..79cc0f79896f 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c | |||
| @@ -214,7 +214,6 @@ static struct platform_driver soc_button_driver = { | |||
| 214 | .remove = soc_button_remove, | 214 | .remove = soc_button_remove, |
| 215 | .driver = { | 215 | .driver = { |
| 216 | .name = KBUILD_MODNAME, | 216 | .name = KBUILD_MODNAME, |
| 217 | .owner = THIS_MODULE, | ||
| 218 | .acpi_match_table = ACPI_PTR(soc_button_acpi_match), | 217 | .acpi_match_table = ACPI_PTR(soc_button_acpi_match), |
| 219 | }, | 218 | }, |
| 220 | }; | 219 | }; |