diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
| commit | ef204fb5c24f9bd09192a9abebad6a06dd0b88db (patch) | |
| tree | a72ee9071462457b27475c2cc86e3c6256388ea9 /shared-core/r300_reg.h | |
| parent | 7f269bec7ed49385de394fdbd970f463ef2060f0 (diff) | |
| parent | b44f2da380e78769b58c751e81f376f0fa1f48aa (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
Diffstat (limited to 'shared-core/r300_reg.h')
| -rw-r--r-- | shared-core/r300_reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shared-core/r300_reg.h b/shared-core/r300_reg.h index 578e7e93..1fce3529 100644 --- a/shared-core/r300_reg.h +++ b/shared-core/r300_reg.h @@ -1632,6 +1632,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define R500_RS_IP_0 0x4074 #define R500_RS_INST_0 0x4320 +#define R500_US_CONFIG 0x4600 + #endif /* _R300_REG_H */ /* *INDENT-ON* */ |