aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/cell/pmu.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-11-24 03:34:03 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-11-24 03:34:03 -0500
commit17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch)
treefe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /arch/powerpc/platforms/cell/pmu.c
parentf87114e982cf3b657411e2df50e4e42ec1f162dd (diff)
parentbe09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff)
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'arch/powerpc/platforms/cell/pmu.c')
-rw-r--r--arch/powerpc/platforms/cell/pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 1acf36010423..59c1a1694104 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -392,7 +392,7 @@ static int __init cbe_init_pm_irq(void)
392 } 392 }
393 393
394 rc = request_irq(irq, cbe_pm_irq, 394 rc = request_irq(irq, cbe_pm_irq,
395 IRQF_DISABLED, "cbe-pmu-0", NULL); 395 0, "cbe-pmu-0", NULL);
396 if (rc) { 396 if (rc) {
397 printk("ERROR: Request for irq on node %d failed\n", 397 printk("ERROR: Request for irq on node %d failed\n",
398 node); 398 node);