diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /arch/arm/mach-s5p6442/include/mach/system.h | |
| parent | perf, tracing: add missing __percpu markups (diff) | |
| parent | tracing: Clean up seqfile code for format file (diff) | |
| download | linux-dev-c8710ad38900153af7a3e6762e99c062cfa46443.tar.xz linux-dev-c8710ad38900153af7a3e6762e99c062cfa46443.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/arm/mach-s5p6442/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/system.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/system.h b/arch/arm/mach-s5p6442/include/mach/system.h index 8bcd8ed0c3c3..c30c1cc1b97e 100644 --- a/arch/arm/mach-s5p6442/include/mach/system.h +++ b/arch/arm/mach-s5p6442/include/mach/system.h @@ -13,12 +13,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -static void arch_idle(void) -{ - /* nothing here yet */ -} +#include <plat/system-reset.h> -static void arch_reset(char mode, const char *cmd) +static void arch_idle(void) { /* nothing here yet */ } |