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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
ttm
/
ttm_object.c
diff --git
a/drivers/gpu/drm/ttm/ttm_object.c
b/drivers/gpu/drm/ttm/ttm_object.c
index
ebddd44
..
93577f2
100644
(file)
--- a/
drivers/gpu/drm/ttm/ttm_object.c
+++ b/
drivers/gpu/drm/ttm/ttm_object.c
@@
-55,7
+55,7
@@
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
struct ttm_object_file {
struct ttm_object_device *tdev;