aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-24 20:01:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-24 20:01:58 -0400
commit3c71d03a28ce653708a9a6dadc5536bf49cbc5fc (patch)
tree0998893f38ab49c1ea89a33102713bc92b5d9d4c
parent824282ca7d250bd7c301f221c3cd902ce906d731 (diff)
parentcf3fa17c2003dd9d1534e7da2d462132e1b70811 (diff)
Merge tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull gpi fix from Linus Walleij: "This is a last minute revert for the GPIO tree, as Mike Dunn noticed breakage on some older PXA machines due to moving PXA GPIO initcalls to the module_init initlevel" * tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: Revert "gpio: pxa: set initcall level to module init"
-rw-r--r--drivers/gpio/gpio-pxa.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 9cc108d2b770..8325f580c0f1 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -642,7 +642,12 @@ static struct platform_driver pxa_gpio_driver = {
642 .of_match_table = of_match_ptr(pxa_gpio_dt_ids), 642 .of_match_table = of_match_ptr(pxa_gpio_dt_ids),
643 }, 643 },
644}; 644};
645module_platform_driver(pxa_gpio_driver); 645
646static int __init pxa_gpio_init(void)
647{
648 return platform_driver_register(&pxa_gpio_driver);
649}
650postcore_initcall(pxa_gpio_init);
646 651
647#ifdef CONFIG_PM 652#ifdef CONFIG_PM
648static int pxa_gpio_suspend(void) 653static int pxa_gpio_suspend(void)