projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r300_cmdbuf.c
diff --git
a/drivers/gpu/drm/radeon/r300_cmdbuf.c
b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index
84b1d53
..
9418e38
100644
(file)
--- a/
drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/
drivers/gpu/drm/radeon/r300_cmdbuf.c
@@
-34,10
+34,10
@@
*/
#include <drm/drmP.h>
-#include <drm/drm_buffer.h>
#include <drm/radeon_drm.h>
#include "radeon_drv.h"
#include "r300_reg.h"
+#include "drm_buffer.h"
#include <asm/unaligned.h>