From 69ded090ba793785c83d4722abe6d53bd352b1ba Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Wed, 28 Nov 2012 14:22:41 -0500
Subject: [PATCH] --- yaml --- r: 336148 b: refs/heads/master c:
 93bbd0c087eb299e0fe11c59d340932180c082b5 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/c6x/include/uapi/asm/Kbuild     | 2 ++
 trunk/arch/c6x/include/uapi/asm/kvm_para.h | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 trunk/arch/c6x/include/uapi/asm/kvm_para.h

diff --git a/[refs] b/[refs]
index b3cfc8653789..8cec71da86d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de0eed2813ce42b8e0320a86cbe373266c904044
+refs/heads/master: 93bbd0c087eb299e0fe11c59d340932180c082b5
diff --git a/trunk/arch/c6x/include/uapi/asm/Kbuild b/trunk/arch/c6x/include/uapi/asm/Kbuild
index c312b424c433..e9bc2b2b8147 100644
--- a/trunk/arch/c6x/include/uapi/asm/Kbuild
+++ b/trunk/arch/c6x/include/uapi/asm/Kbuild
@@ -1,6 +1,8 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
+generic-y += kvm_para.h
+
 header-y += byteorder.h
 header-y += kvm_para.h
 header-y += ptrace.h
diff --git a/trunk/arch/c6x/include/uapi/asm/kvm_para.h b/trunk/arch/c6x/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f0b957..000000000000
--- a/trunk/arch/c6x/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>