diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 01:29:27 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 01:29:27 (GMT) |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mach-ns9xxx/include/mach/system.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
| download | linux-fsl-qoriq-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.xz | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/mach-ns9xxx/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/include/mach/system.h b/arch/arm/mach-ns9xxx/include/mach/system.h index e2068c5..1561588 100644 --- a/arch/arm/mach-ns9xxx/include/mach/system.h +++ b/arch/arm/mach-ns9xxx/include/mach/system.h @@ -20,7 +20,7 @@ static inline void arch_idle(void) cpu_do_idle(); } -static inline void arch_reset(char mode) +static inline void arch_reset(char mode, const char *cmd) { #ifdef CONFIG_PROCESSOR_NS9360 if (processor_is_ns9360()) |