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
/
ttm
/
ttm_bo_util.c
diff --git
a/drivers/gpu/drm/ttm/ttm_bo_util.c
b/drivers/gpu/drm/ttm/ttm_bo_util.c
index
2a4aa57
..
2026060
100644
(file)
--- a/
drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/
drivers/gpu/drm/ttm/ttm_bo_util.c
@@
-472,7
+472,7
@@
pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
else
tmp = pgprot_noncached(tmp);
#endif
-#if defined(__sparc__)
+#if defined(__sparc__)
|| defined(__mips__)
if (!(caching_flags & TTM_PL_FLAG_CACHED))
tmp = pgprot_noncached(tmp);
#endif