diff options
| author | Linus Torvalds | 2012-12-18 19:08:47 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-18 19:08:47 +0100 |
| commit | 9a8a5702c5a7298c0edd125464aa178dd8b50440 (patch) | |
| tree | 9d8aab6f2670e23f8517f44c5a79c3127e2eb5c2 /arch/openrisc/include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | openrisc: use kbuild.h instead of defining macros in asm-offset.c (diff) | |
| download | kernel-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')
| -rw-r--r-- | arch/openrisc/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/openrisc/include/uapi/asm/kvm_para.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 8971026e1c63..f20d01d9aaf9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -32,6 +32,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 += local.h generic-y += mman.h generic-y += module.h 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> |