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 branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
gma500
/
oaktrail_device.c
diff --git
a/drivers/gpu/drm/gma500/oaktrail_device.c
b/drivers/gpu/drm/gma500/oaktrail_device.c
index 27d3875d895bae384a482a17768ee0f0a8dfb448..368a03ae3010a34d37e206c6792356799c361e24 100644
(file)
--- a/
drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/
drivers/gpu/drm/gma500/oaktrail_device.c
@@
-26,7
+26,7
@@
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
-#include <asm/
mrst
.h>
+#include <asm/
intel-mid
.h>
#include <asm/intel_scu_ipc.h>
#include "mid_bios.h"
#include "intel_bios.h"