diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-s5pv210/include/mach/system.h | |
| parent | 500b9fc922cbec572f4fd1436533bfaed5011262 (diff) | |
| parent | a68fefe0d2f364ac3d8497ef37dcad713c261103 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/system.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/system.h b/arch/arm/mach-s5pv210/include/mach/system.h index 1ca04d5025b3..af8a200b2135 100644 --- a/arch/arm/mach-s5pv210/include/mach/system.h +++ b/arch/arm/mach-s5pv210/include/mach/system.h | |||
| @@ -13,12 +13,9 @@ | |||
| 13 | #ifndef __ASM_ARCH_SYSTEM_H | 13 | #ifndef __ASM_ARCH_SYSTEM_H |
| 14 | #define __ASM_ARCH_SYSTEM_H __FILE__ | 14 | #define __ASM_ARCH_SYSTEM_H __FILE__ |
| 15 | 15 | ||
| 16 | static void arch_idle(void) | 16 | #include <plat/system-reset.h> |
| 17 | { | ||
| 18 | /* nothing here yet */ | ||
| 19 | } | ||
| 20 | 17 | ||
| 21 | static void arch_reset(char mode, const char *cmd) | 18 | static void arch_idle(void) |
| 22 | { | 19 | { |
| 23 | /* nothing here yet */ | 20 | /* nothing here yet */ |
| 24 | } | 21 | } |