summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv310/include/mach/system.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
commit2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch)
tree15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-s5pv310/include/mach/system.h
parent500b9fc922cbec572f4fd1436533bfaed5011262 (diff)
parenta68fefe0d2f364ac3d8497ef37dcad713c261103 (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-s5pv310/include/mach/system.h')
-rw-r--r--arch/arm/mach-s5pv310/include/mach/system.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/system.h b/arch/arm/mach-s5pv310/include/mach/system.h
new file mode 100644
index 000000000000..d10c009cf0f1
--- /dev/null
+++ b/arch/arm/mach-s5pv310/include/mach/system.h
@@ -0,0 +1,22 @@
+/* linux/arch/arm/mach-s5pv310/include/mach/system.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * S5PV310 - system support header
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_SYSTEM_H
+#define __ASM_ARCH_SYSTEM_H __FILE__
+
+#include <plat/system-reset.h>
+
+static void arch_idle(void)
+{
+ /* nothing here yet */
+}
+#endif /* __ASM_ARCH_SYSTEM_H */