diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
| commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-s5pv210/include/mach/system.h | |
| parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
| download | op-kernel-dev-b48741cce3be32a48af9a2b272f3f13a077375cf.zip op-kernel-dev-b48741cce3be32a48af9a2b272f3f13a077375cf.tar.gz | |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/system.h b/arch/arm/mach-s5pv210/include/mach/system.h index af8a200..bf288ce 100644 --- a/arch/arm/mach-s5pv210/include/mach/system.h +++ b/arch/arm/mach-s5pv210/include/mach/system.h @@ -13,8 +13,6 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -#include <plat/system-reset.h> - static void arch_idle(void) { /* nothing here yet */ |
