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
/
gma500
/
oaktrail_lvds.c
diff --git
a/drivers/gpu/drm/gma500/oaktrail_lvds.c
b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index
4c17c93
..
5e06978
100644
(file)
--- a/
drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/
drivers/gpu/drm/gma500/oaktrail_lvds.c
@@
-22,7
+22,7
@@
#include <linux/i2c.h>
#include <drm/drmP.h>
-#include <asm/
mrst
.h>
+#include <asm/
intel-mid
.h>
#include "intel_bios.h"
#include "psb_drv.h"