Commit 3c71d03a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v3.9-lastminute' of git://

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://
  Revert "gpio: pxa: set initcall level to module init"
parents 824282ca cf3fa17c
......@@ -642,7 +642,12 @@ static struct platform_driver pxa_gpio_driver = {
.of_match_table = of_match_ptr(pxa_gpio_dt_ids),
static int __init pxa_gpio_init(void)
return platform_driver_register(&pxa_gpio_driver);
#ifdef CONFIG_PM
static int pxa_gpio_suspend(void)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment