git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/iommu-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6442
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-s5p6442/include/mach/system.h
b/arch/arm/mach-s5p6442/include/mach/system.h
index
8bcd8ed
..
c30c1cc
100644
(file)
--- 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__
#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 *cm
d)
+static void arch_
idle(voi
d)
{
/* nothing here yet */
}
{
/* nothing here yet */
}