summaryrefslogtreecommitdiffstats
path: root/arch/openrisc/include/uapi/asm
diff options
context:
space:
mode:
authorLinus Torvalds2012-12-18 19:08:47 +0100
committerLinus Torvalds2012-12-18 19:08:47 +0100
commit9a8a5702c5a7298c0edd125464aa178dd8b50440 (patch)
tree9d8aab6f2670e23f8517f44c5a79c3127e2eb5c2 /arch/openrisc/include/uapi/asm
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff)
parentopenrisc: use kbuild.h instead of defining macros in asm-offset.c (diff)
downloadkernel-qcow2-linux-9a8a5702c5a7298c0edd125464aa178dd8b50440.tar.gz
kernel-qcow2-linux-9a8a5702c5a7298c0edd125464aa178dd8b50440.tar.xz
kernel-qcow2-linux-9a8a5702c5a7298c0edd125464aa178dd8b50440.zip
Merge tag 'for-3.8' of git://openrisc.net/~jonas/linux
Pull OpenRISC update from Jonas Bonn: "Trivial cleanups for OpenRISC." * tag 'for-3.8' of git://openrisc.net/~jonas/linux: openrisc: use kbuild.h instead of defining macros in asm-offset.c openrisc: Use Kbuild infrastructure for kvm_para.h
Diffstat (limited to 'arch/openrisc/include/uapi/asm')
-rw-r--r--arch/openrisc/include/uapi/asm/kvm_para.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/openrisc/include/uapi/asm/kvm_para.h b/arch/openrisc/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f0b957..000000000000
--- a/arch/openrisc/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>