diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /arch/arm/mach-pxa/reset.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
| -rw-r--r-- | arch/arm/mach-pxa/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 00b2dc2a107..df29d45fb4e 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -10,7 +10,7 @@ #include <linux/io.h> #include <asm/proc-fns.h> -#include <mach/pxa-regs.h> +#include <mach/regs-ost.h> #include <mach/reset.h> unsigned int reset_status; @@ -81,7 +81,7 @@ static void do_hw_reset(void) OSMR3 = OSCR + 368640; /* ... in 100 ms */ } -void arch_reset(char mode) +void arch_reset(char mode, const char *cmd) { clear_reset_status(RESET_STATUS_ALL); |