diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 13:53:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 13:53:40 -0800 |
commit | 37ef4399a6bb265d3035e6d6e45f7677b132a3ba (patch) | |
tree | 31adbac36ea310a44562a335f501d69d5ce2c78c /drivers/char/drm/r300_reg.h | |
parent | bf785ee0aeea7a3e717cb1e11df4135b6cbde7da (diff) | |
parent | 9c7d462eda13ca211b7b4a62f191f4cfda135e2d (diff) |
Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/r300_reg.h')
-rw-r--r-- | drivers/char/drm/r300_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index e5b73c00239..a0ed20e2522 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h @@ -797,6 +797,7 @@ I am fairly certain that they are correct unless stated otherwise in comments. # define R300_TX_FORMAT_YUV_MODE 0x00800000 +#define R300_TX_PITCH_0 0x4500 #define R300_TX_OFFSET_0 0x4540 /* BEGIN: Guess from R200 */ # define R300_TXO_ENDIAN_NO_SWAP (0 << 0) |