From f2492819dddb271bf23673192d4e94e32052a35a Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 12 Oct 2012 22:26:36 -0400 Subject: [PATCH] --- yaml --- r: 346849 b: refs/heads/master c: e9dfcdbd76b14a24e751d6e0bfb29dc262c69b0c h: refs/heads/master i: 346847: 88cde32c335e108591d06bfa14a3e33999132234 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/Kbuild | 1 + trunk/arch/blackfin/include/uapi/asm/kvm_para.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 trunk/arch/blackfin/include/uapi/asm/kvm_para.h diff --git a/[refs] b/[refs] index 204acfce0606..5dd8b97fa00c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba364504f2c31665007330dec23e89e44f5864e +refs/heads/master: e9dfcdbd76b14a24e751d6e0bfb29dc262c69b0c diff --git a/trunk/arch/blackfin/include/asm/Kbuild b/trunk/arch/blackfin/include/asm/Kbuild index 7ce56f5f6dda..9d1f5b381b89 100644 --- a/trunk/arch/blackfin/include/asm/Kbuild +++ b/trunk/arch/blackfin/include/asm/Kbuild @@ -16,6 +16,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local64.h generic-y += local.h generic-y += mman.h diff --git a/trunk/arch/blackfin/include/uapi/asm/kvm_para.h b/trunk/arch/blackfin/include/uapi/asm/kvm_para.h deleted file mode 100644 index 14fab8f0b957..000000000000 --- a/trunk/arch/blackfin/include/uapi/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include