diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-04 05:09:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-04 05:09:45 -0400 |
| commit | 4564747649db987722aa781280eb8325c6a5a1a8 (patch) | |
| tree | c75bd92f4c6a59e9873088f1e5357cd3242977cd /arch/arm/mach-omap2/pm34xx.c | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| parent | 1ce029968718477149e7f1fb245a8e82c690cc4a (diff) | |
Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index a34023d0ca7c..3a595e899724 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -724,6 +724,7 @@ int __init omap3_pm_init(void) | |||
| 724 | ret = request_irq(omap_prcm_event_to_irq("io"), | 724 | ret = request_irq(omap_prcm_event_to_irq("io"), |
| 725 | _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io", | 725 | _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io", |
| 726 | omap3_pm_init); | 726 | omap3_pm_init); |
| 727 | enable_irq(omap_prcm_event_to_irq("io")); | ||
| 727 | 728 | ||
| 728 | if (ret) { | 729 | if (ret) { |
| 729 | pr_err("pm: Failed to request pm_io irq\n"); | 730 | pr_err("pm: Failed to request pm_io irq\n"); |