aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2011-01-10 00:29:04 +0100
committerEric Miao <eric.y.miao@gmail.com>2011-01-14 10:21:05 -0600
commit57879b8c40d4c254f1feba3adbeb69614fe5e4c9 (patch)
tree44573f31d87cdf1c772add453eed914813782183 /arch/arm
parentARM: pxa: remove unused variable in clock-pxa3xx.c (diff)
downloadlinux-dev-57879b8c40d4c254f1feba3adbeb69614fe5e4c9.tar.xz
linux-dev-57879b8c40d4c254f1feba3adbeb69614fe5e4c9.zip
ARM: pxa: use cpu_has_ipr() consistently in irq.c
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 3f7f5bf05f3a..8f947002c0bf 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/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));