projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_acpi.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_acpi.c
b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index
e7369c8
..
48783e1
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_acpi.c
@@
-9,7
+9,7
@@
#include <linux/vga_switcheroo.h>
-#include
"drm_edid.h"
+#include
<drm/drm_edid.h>
#include "nouveau_drm.h"
#include "nouveau_acpi.h"