diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /tools/include/uapi/asm-generic/mman.h | |
| parent | Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
| parent | Linux 5.1-rc5 (diff) | |
| download | linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.tar.xz linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.zip | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/include/uapi/asm-generic/mman.h')
| -rw-r--r-- | tools/include/uapi/asm-generic/mman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/uapi/asm-generic/mman.h b/tools/include/uapi/asm-generic/mman.h index 653687d9771b..36c197fc44a0 100644 --- a/tools/include/uapi/asm-generic/mman.h +++ b/tools/include/uapi/asm-generic/mman.h @@ -2,7 +2,7 @@ #ifndef __ASM_GENERIC_MMAN_H #define __ASM_GENERIC_MMAN_H -#include <asm-generic/mman-common.h> +#include <asm-generic/mman-common-tools.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |