projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_fb.c
diff --git
a/drivers/gpu/drm/i915/intel_fb.c
b/drivers/gpu/drm/i915/intel_fb.c
index 97f673523b9754f69ebef2308e1ab92539cf29e3..7b30b5c2c4ee1128796f1e3362a23567e13b3549 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_fb.c
+++ b/
drivers/gpu/drm/i915/intel_fb.c
@@
-36,12
+36,11
@@
#include <linux/init.h>
#include <linux/vga_switcheroo.h>
#include <linux/init.h>
#include <linux/vga_switcheroo.h>
-#include "drmP.h"
-#include "drm.h"
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_helper.h>
#include "intel_drv.h"
#include "intel_drv.h"
-#include
"i915_drm.h"
+#include
<drm/i915_drm.h>
#include "i915_drv.h"
static struct fb_ops intelfb_ops = {
#include "i915_drv.h"
static struct fb_ops intelfb_ops = {