From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Wed, 30 Jan 2008 12:32:38 +0000 (+0100)
Subject: git-x86: unbreak UML
X-Git-Tag: v2.6.25-rc1~1143^2~424
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2a10e7c41254941cac87be1eccdcb6379ce097f5;p=linux-2.6-omap-h63xx.git

git-x86: unbreak UML

Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-um/nops.h b/include/asm-um/nops.h
new file mode 100644
index 00000000000..814e9bf5dea
--- /dev/null
+++ b/include/asm-um/nops.h
@@ -0,0 +1,6 @@
+#ifndef __UM_NOPS_H
+#define __UM_NOPS_H
+
+#include "asm/arch/nops.h"
+
+#endif