diff options
author | 2017-06-20 11:50:41 -0400 | |
---|---|---|
committer | 2017-06-20 11:50:41 -0400 | |
commit | b15cdca5b5de52dc2262c41917e8727b96b30fb0 (patch) | |
tree | f61c45517b1763e40ebc1d2fbed3af906281ead5 /drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |
parent | Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes (diff) | |
parent | Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
download | linux-dev-b15cdca5b5de52dc2262c41917e8727b96b30fb0.tar.xz linux-dev-b15cdca5b5de52dc2262c41917e8727b96b30fb0.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerging airlied/drm-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_virtual.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index f1b479b6ac98..90bb08309a53 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include "drmP.h" +#include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_pm.h" #include "amdgpu_i2c.h" |