diff options
| author | Greg Kroah-Hartman | 2018-01-02 15:13:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-01-02 15:13:41 +0100 |
| commit | 01f1918833e4817fdb0810306c021c5cbee775d3 (patch) | |
| tree | 34a649c453d30fee1f1b564badb6e3dc210655c3 /tools/perf/arch/s390/include/perf_regs.h | |
| parent | usb: pd: fix the offset for SVID specific commands (diff) | |
| parent | Linux 4.15-rc6 (diff) | |
| download | kernel-qcow2-linux-01f1918833e4817fdb0810306c021c5cbee775d3.tar.gz kernel-qcow2-linux-01f1918833e4817fdb0810306c021c5cbee775d3.tar.xz kernel-qcow2-linux-01f1918833e4817fdb0810306c021c5cbee775d3.zip | |
Merge 4.15.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue with the
vhci_rx.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/arch/s390/include/perf_regs.h')
| -rw-r--r-- | tools/perf/arch/s390/include/perf_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/s390/include/perf_regs.h b/tools/perf/arch/s390/include/perf_regs.h index d2df54a6bc5a..bcfbaed78cc2 100644 --- a/tools/perf/arch/s390/include/perf_regs.h +++ b/tools/perf/arch/s390/include/perf_regs.h @@ -3,7 +3,7 @@ #include <stdlib.h> #include <linux/types.h> -#include <../../../../arch/s390/include/uapi/asm/perf_regs.h> +#include <asm/perf_regs.h> void perf_regs_load(u64 *regs); |