git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_gart.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index e7406ce7093cdbaf79b8c89fd723ca7e64cd86ee..902e6015abca377bb10b057dbb0c8479b66be394 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@
-27,6
+27,9
@@
*/
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "amdgpu.h"
/*