diff options
| author | Dima Zavin <dima@android.com> | 2011-10-28 13:06:16 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-10-28 13:06:16 -0700 |
| commit | 8891abf9f882dff9ad3c00b0a41b41da6597cc30 (patch) | |
| tree | e005782ea8f3ea3daffcbdd4d3f36db050d2c6c7 /arch/arm/mach-omap2/pm44xx.c | |
| parent | e29110c52b531e2405ebb1cca8c321e8f0424915 (diff) | |
| parent | e0a37dd7b6dc713318c12484177dc6035d0f4d6a (diff) | |
| download | kernel_samsung_tuna-8891abf9f882dff9ad3c00b0a41b41da6597cc30.zip kernel_samsung_tuna-8891abf9f882dff9ad3c00b0a41b41da6597cc30.tar.gz kernel_samsung_tuna-8891abf9f882dff9ad3c00b0a41b41da6597cc30.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rwxr-xr-x | arch/arm/mach-omap2/pm44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 2ed715c..770cc1f 100755 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -1116,7 +1116,7 @@ static int __init omap4_pm_init(void) ret = request_irq(OMAP44XX_IRQ_PRCM, (irq_handler_t)prcm_interrupt_handler, - IRQF_DISABLED, "prcm", NULL); + IRQF_NO_SUSPEND | IRQF_DISABLED, "prcm", NULL); if (ret) { printk(KERN_ERR "request_irq failed to register for 0x%x\n", OMAP44XX_IRQ_PRCM); |