diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:35:55 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:35:55 +0000 |
commit | 41eba03d0d62fe03a7b437c9c4914016c3125141 (patch) | |
tree | 9b74e1bc450726c2cb7c2abadec6d2662b7f406c /src/i830.h | |
parent | e27494f2a9262b6310c2f1e0a40c406f578fc693 (diff) |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/i830.h')
-rw-r--r-- | src/i830.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.13 2004/02/20 00:06:00 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.12 2004/01/07 03:43:19 dawes Exp $ */ /* * Authors: @@ -401,7 +401,8 @@ extern void I830ChangeFrontbuffer(ScrnInfoPtr pScrn,int buffer); #define ALLOCATE_DRY_RUN 0x80000000 /* Chipset registers for VIDEO BIOS memory RW access */ -#define DRAM_RW_CONTROL 0x58 +#define _855_DRAM_RW_CONTROL 0x58 +#define _845_DRAM_RW_CONTROL 0x90 #define DRAM_WRITE 0x33330000 #endif /* _I830_H_ */ |