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/gpio/gpio-octeon.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/gpio/gpio-octeon.c')
| -rw-r--r-- | drivers/gpio/gpio-octeon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-octeon.c b/drivers/gpio/gpio-octeon.c index 5c5770c99c80..62ae251d4490 100644 --- a/drivers/gpio/gpio-octeon.c +++ b/drivers/gpio/gpio-octeon.c | |||
| @@ -144,7 +144,6 @@ MODULE_DEVICE_TABLE(of, octeon_gpio_match); | |||
| 144 | static struct platform_driver octeon_gpio_driver = { | 144 | static struct platform_driver octeon_gpio_driver = { |
| 145 | .driver = { | 145 | .driver = { |
| 146 | .name = "octeon_gpio", | 146 | .name = "octeon_gpio", |
| 147 | .owner = THIS_MODULE, | ||
| 148 | .of_match_table = octeon_gpio_match, | 147 | .of_match_table = octeon_gpio_match, |
| 149 | }, | 148 | }, |
| 150 | .probe = octeon_gpio_probe, | 149 | .probe = octeon_gpio_probe, |