projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[linux-block.git]
/
drivers
/
gpu
/
drm
/
gma500
/
psb_drv.h
diff --git
a/drivers/gpu/drm/gma500/psb_drv.h
b/drivers/gpu/drm/gma500/psb_drv.h
index 93d2f4000d2f90beb943539dd0bdfc0f668c7707..941b238bdcc9642067df5c95273a109bee7df3a8 100644
(file)
--- a/
drivers/gpu/drm/gma500/psb_drv.h
+++ b/
drivers/gpu/drm/gma500/psb_drv.h
@@
-24,7
+24,6
@@
#include <linux/mm_types.h>
#include <drm/drmP.h>
-#include <drm/drm_global.h>
#include <drm/gma_drm.h>
#include "psb_reg.h"
#include "psb_intel_drv.h"