---

yaml --- r: 231385 b: refs/heads/master c: 57879b8 h: refs/heads/master i: 231383: 004c409 v: v3
git-mirror · Jan 14, 2011 · f422959 · f422959
1 parent 5b5e487
commit f422959
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6aec3a5d6d8e898baef3ed0d1b2911ee5e718a3
+refs/heads/master: 57879b8c40d4c254f1feba3adbeb69614fe5e4c9
diff --git a/trunk/arch/arm/mach-pxa/irq.c b/trunk/arch/arm/mach-pxa/irq.c
@@ -226,7 +226,7 @@ static int pxa_irq_resume(struct sys_device *dev)
 		__raw_writel(0, base + ICLR);
 	}
 
-	if (!cpu_is_pxa25x())
+	if (cpu_has_ipr())
 		for (i = 0; i < pxa_internal_irq_nr; i++)
 			__raw_writel(saved_ipr[i], IRQ_BASE + IPR(i));