diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-14 15:14:36 +0100 |
| commit | 6fbefa4e81780e7e372c19e31cd33cc2456b230f (patch) | |
| tree | 79178a0b363a4673ff0c859b25d0d20d890fc234 /include/drm | |
| parent | 9c513523039dc8ee83f8f527acdcbc7a792d83bc (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.tar.gz linux-next-6fbefa4e81780e7e372c19e31cd33cc2456b230f.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_print.h | 1 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_tt.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 0805903c093b..efa256ef01fc 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -28,6 +28,7 @@ #include <linux/compiler.h> #include <linux/printk.h> +#include <linux/string_choices.h> #include <linux/device.h> #include <linux/dynamic_debug.h> diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 406437ad674b..58c8bf9a6cbd 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -27,7 +27,6 @@ #ifndef _TTM_TT_H_ #define _TTM_TT_H_ -#include <linux/pagemap.h> #include <linux/types.h> #include <drm/ttm/ttm_caching.h> #include <drm/ttm/ttm_kmap_iter.h> |