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]
/
include
/
drm
/
ttm
/
ttm_lock.h
diff --git
a/include/drm/ttm/ttm_lock.h
b/include/drm/ttm/ttm_lock.h
index
81ba0b0
..
2e7f0c9
100644
(file)
--- a/
include/drm/ttm/ttm_lock.h
+++ b/
include/drm/ttm/ttm_lock.h
@@
-51,7
+51,7
@@
#include "ttm/ttm_object.h"
#include <linux/wait.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
/**
* struct ttm_lock