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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
nid.h
diff --git
a/drivers/gpu/drm/radeon/nid.h
b/drivers/gpu/drm/radeon/nid.h
index
9736746
..
4672869
100644
(file)
--- a/
drivers/gpu/drm/radeon/nid.h
+++ b/
drivers/gpu/drm/radeon/nid.h
@@
-320,7
+320,7
@@
#define CGTS_USER_TCC_DISABLE 0x914C
#define TCC_DISABLE_MASK 0xFFFF0000
#define TCC_DISABLE_SHIFT 16
-#define CGTS_SM_CTRL_REG 0x915
C
+#define CGTS_SM_CTRL_REG 0x915
0
#define OVERRIDE (1 << 21)
#define TA_CNTL_AUX 0x9508