aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-mpc5200.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-10 14:35:36 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-10 14:35:36 -0500
commit4ba24fef3eb3b142197135223b90ced2f319cd53 (patch)
treea20c125b27740ec7b4c761b11d801108e1b316b2 /drivers/gpio/gpio-mpc5200.c
parent47c1ffb2b6b630894e9a16442611c056ab21c057 (diff)
parent98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff)
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'drivers/gpio/gpio-mpc5200.c')
-rw-r--r--drivers/gpio/gpio-mpc5200.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index 42647f26c9e0..8ce6c9510035 100644
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -192,7 +192,6 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
192static struct platform_driver mpc52xx_wkup_gpiochip_driver = { 192static struct platform_driver mpc52xx_wkup_gpiochip_driver = {
193 .driver = { 193 .driver = {
194 .name = "mpc5200-gpio-wkup", 194 .name = "mpc5200-gpio-wkup",
195 .owner = THIS_MODULE,
196 .of_match_table = mpc52xx_wkup_gpiochip_match, 195 .of_match_table = mpc52xx_wkup_gpiochip_match,
197 }, 196 },
198 .probe = mpc52xx_wkup_gpiochip_probe, 197 .probe = mpc52xx_wkup_gpiochip_probe,
@@ -347,7 +346,6 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
347static struct platform_driver mpc52xx_simple_gpiochip_driver = { 346static struct platform_driver mpc52xx_simple_gpiochip_driver = {
348 .driver = { 347 .driver = {
349 .name = "mpc5200-gpio", 348 .name = "mpc5200-gpio",
350 .owner = THIS_MODULE,
351 .of_match_table = mpc52xx_simple_gpiochip_match, 349 .of_match_table = mpc52xx_simple_gpiochip_match,
352 }, 350 },
353 .probe = mpc52xx_simple_gpiochip_probe, 351 .probe = mpc52xx_simple_gpiochip_probe,