diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
commit | 74c0167f8bcf02af8ff9f2677b2d85070ba7236d (patch) | |
tree | 5a840e9abb2e49abd64180c48e6e77ce428b237c /arch/riscv/include/uapi/asm/Kbuild | |
parent | 5db47e37b38755c5e26e6b8fbc1a32ce73495940 (diff) | |
parent | 559f17bec508548850654dd04525fd69d90f6d4e (diff) | |
download | linux-74c0167f8bcf02af8ff9f2677b2d85070ba7236d.tar.gz |
Merge drm-next into drm-intel-next-queued
Pull 4.15 into drm-intel-next-queued for next feature pull.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'arch/riscv/include/uapi/asm/Kbuild')
-rw-r--r-- | arch/riscv/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/riscv/include/uapi/asm/Kbuild b/arch/riscv/include/uapi/asm/Kbuild index 5ded96b06352..7e91f4850475 100644 --- a/arch/riscv/include/uapi/asm/Kbuild +++ b/arch/riscv/include/uapi/asm/Kbuild @@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += setup.h generic-y += unistd.h +generic-y += bpf_perf_event.h generic-y += errno.h generic-y += fcntl.h generic-y += ioctl.h |