diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 16:20:04 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 16:20:58 +0300 |
| commit | d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5 (patch) | |
| tree | e194b1968e54380a6654abf7d3a037ca0a010280 /arch/sparc/include/uapi/asm/kvm_para.h | |
| parent | 9a51b86a61214a297cdfc1bb705b7267f9455ae6 (diff) | |
| parent | d5984d2a312144bedccf32aea2298f8df05bb617 (diff) | |
| download | linux-d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5.tar.xz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.2
Mainly some pca954x work, i.e. removal of unused platform data support
and added support for sysfs interface for manipulating/examining the
idle state. And then a mechanical cocci-style patch.
Diffstat (limited to 'arch/sparc/include/uapi/asm/kvm_para.h')
| -rw-r--r-- | arch/sparc/include/uapi/asm/kvm_para.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h deleted file mode 100644 index baacc4996d18..000000000000 --- a/arch/sparc/include/uapi/asm/kvm_para.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#include <asm-generic/kvm_para.h> |