diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:18:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:18:43 -0800 |
| commit | fa29f5ba42404b44aceb1a63ff4757efe5cd1789 (patch) | |
| tree | 8dfe660eeb443561582efe2b0cc7c8b228172796 /include/drm | |
| parent | Merge tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground (diff) | |
| parent | asm-generic/page.h: fix typo in #error text requiring a real asm/page.h (diff) | |
| download | wireguard-linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.tar.xz wireguard-linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.zip | |
Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"Only a few small changes this time:
- Michael S. Tsirkin cleans up linux/mman.h
- Mike Rapoport found a typo
I had originally merged another cleanup series for I/O accessors from
Hugo Lefeuvre as well, but dropped it after the discussion of the
barrier semantics and some conflicts. I expect this series to get
merged for a later release though"
* tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/page.h: fix typo in #error text requiring a real asm/page.h
arch: move common mmap flags to linux/mman.h
drm: tweak header name
x86/mpx: tweak header name
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index bdb0d5548f39..a3184416ddc5 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -57,8 +57,7 @@ #include <linux/workqueue.h> #include <linux/dma-fence.h> #include <linux/module.h> - -#include <asm/mman.h> +#include <linux/mman.h> #include <asm/pgalloc.h> #include <linux/uaccess.h> |