Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:59:19 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: core_types.h

Log Message:
amdgpu: Include hw/audio.h; avoid config(5)-caused audio.h collision.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.2	Sat Dec 18 23:45:05 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h	Sun Dec 19 11:59:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_types.h,v 1.2 2021/12/18 23:45:05 riastradh Exp $	*/
+/*	$NetBSD: core_types.h,v 1.3 2021/12/19 11:59:19 riastradh Exp $	*/
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -50,7 +50,7 @@ void enable_surface_flip_reporting(struc
 #include "link_encoder.h"
 #include "stream_encoder.h"
 #include "clock_source.h"
-#include "audio.h"
+#include "hw/audio.h"
 #include "dm_pp_smu.h"
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 #include "dm_cp_psp.h"

Reply via email to