git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_fence.c
diff --git
a/drivers/gpu/drm/radeon/radeon_fence.c
b/drivers/gpu/drm/radeon/radeon_fence.c
index
1eb3db5
..
22bd6c2
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_fence.c
+++ b/
drivers/gpu/drm/radeon/radeon_fence.c
@@
-34,8
+34,7
@@
#include <linux/list.h>
#include <linux/kref.h>
#include <linux/slab.h>
-#include "drmP.h"
-#include "drm.h"
+#include <drm/drmP.h>
#include "radeon_reg.h"
#include "radeon.h"
#include "radeon_trace.h"