aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa27x.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-07 06:05:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-07 06:06:47 -0400
commitafd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch)
tree6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/pxa27x.c
parent1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 (diff)
parent214c6a7ed13e01cab2addeef56124067e4d20147 (diff)
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Conflicts: arch/arm/mach-pxa/generic.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa2xx.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/reset.c arch/arm/mach-pxa/spitz.c arch/arm/mach-pxa/tosa.c drivers/watchdog/sa1100_wdt.c
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r--arch/arm/mach-pxa/pxa27x.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 6bec43484ba7..f9f6a9c31f4b 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -24,6 +24,7 @@
24#include <mach/pxa-regs.h> 24#include <mach/pxa-regs.h>
25#include <mach/pxa2xx-regs.h> 25#include <mach/pxa2xx-regs.h>
26#include <mach/mfp-pxa27x.h> 26#include <mach/mfp-pxa27x.h>
27#include <mach/reset.h>
27#include <mach/ohci.h> 28#include <mach/ohci.h>
28#include <mach/pm.h> 29#include <mach/pm.h>
29#include <mach/dma.h> 30#include <mach/dma.h>
@@ -384,6 +385,9 @@ static int __init pxa27x_init(void)
384 int i, ret = 0; 385 int i, ret = 0;
385 386
386 if (cpu_is_pxa27x()) { 387 if (cpu_is_pxa27x()) {
388
389 reset_status = RCSR;
390
387 clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks)); 391 clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks));
388 392
389 if ((ret = pxa_init_dma(32))) 393 if ((ret = pxa_init_dma(32)))