aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index a8796aea8353..13437582342d 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -25,6 +25,7 @@
25#include <asm/arch/irqs.h> 25#include <asm/arch/irqs.h>
26#include <asm/arch/pxa-regs.h> 26#include <asm/arch/pxa-regs.h>
27#include <asm/arch/pm.h> 27#include <asm/arch/pm.h>
28#include <asm/arch/dma.h>
28 29
29#include "generic.h" 30#include "generic.h"
30 31
@@ -137,7 +138,11 @@ void __init pxa25x_init_irq(void)
137 138
138static int __init pxa25x_init(void) 139static int __init pxa25x_init(void)
139{ 140{
141 int ret = 0;
142
140 if (cpu_is_pxa21x() || cpu_is_pxa25x()) { 143 if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
144 if ((ret = pxa_init_dma(16)))
145 return ret;
141#ifdef CONFIG_PM 146#ifdef CONFIG_PM
142 pm_set_ops(&pxa25x_pm_ops); 147 pm_set_ops(&pxa25x_pm_ops);
143#endif 148#endif