dirty fix to merging

1 files changed, 37 insertions, 0 deletions

diff --git a/arch/arm/mach-wmt/include/mach/system.h b/arch/arm/mach-wmt/include/mach/system.h
new file mode 100755
index 00000000..478e33b8
--- /dev/null
+++ b/arch/arm/mach-wmt/include/mach/system.h
@@ -0,0 +1,37 @@
+/*++
+linux/include/asm-arm/arch-wmt/system.h
+
+Copyright (c) 2008  WonderMedia Technologies, Inc.
+
+This program is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software Foundation,
+either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+You should have received a copy of the GNU General Public License along with
+this program.  If not, see <http://www.gnu.org/licenses/>.
+
+WonderMedia Technologies, Inc.
+10F, 529, Chung-Cheng Road, Hsin-Tien, Taipei 231, R.O.C.
+--*/
+
+#include <mach/hardware.h>
+
+static inline void arch_idle(void)
+{
+	cpu_do_idle();
+}
+
+extern inline void arch_reset(char mode)
+{
+	if (mode == 's') {
+		/* Jump into ROM at address 0 */
+		cpu_reset(0);
+	} else {
+		/* Use on-chip reset capability */
+		PMSR_VAL = PMSR_SWR;
+	}
+}
+