diff options
| author | Rob Clark <robdclark@chromium.org> | 2024-10-30 09:49:12 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2024-10-30 09:49:12 -0700 |
| commit | 4a6fd06643afa99989a0e6b848e125099674227b (patch) | |
| tree | 906305fd51a4813c9c2383cf6d42889d4188aea4 /drivers/gpu/drm/amd/amdgpu/atom.c | |
| parent | d6d1ad32d00714ecf9f1996173c6f98e43c5b022 (diff) | |
| parent | 904bc5479896d8da7dcd3e162ce224c32c3dc6c3 (diff) | |
| download | lwn-4a6fd06643afa99989a0e6b848e125099674227b.tar.gz lwn-4a6fd06643afa99989a0e6b848e125099674227b.zip | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Merging to pick up commit 785324db2d7a ("drm/msm/dp: migrate the
ycbcr_420_allowed to drm_bridge").
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/atom.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/atom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c index 09715b506468..81d195d366ce 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.c +++ b/drivers/gpu/drm/amd/amdgpu/atom.c @@ -27,7 +27,7 @@ #include <linux/slab.h> #include <linux/string_helpers.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <drm/drm_util.h> |