diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/sbus/char/mach64.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/sbus/char/mach64.h')
| -rw-r--r-- | drivers/sbus/char/mach64.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/sbus/char/mach64.h b/drivers/sbus/char/mach64.h index 02593fa7b..2b30888e8 100644 --- a/drivers/sbus/char/mach64.h +++ b/drivers/sbus/char/mach64.h @@ -1,4 +1,4 @@ -/* $Id: mach64.h,v 1.4 1997/10/04 08:51:30 ecd Exp $ +/* $Id: mach64.h,v 1.5 1998/04/01 05:52:58 ecd Exp $ * mach64.h: Ultra/PCI mach64 driver constants etc. * * Copyright 1997 David S. Miller (davem@caip.rutgers.edu) @@ -9,12 +9,10 @@ struct mach64_info { unsigned int color_mode; - unsigned int flags; + unsigned int chip_type; unsigned int total_vram; }; -/* The mach64_info flag bits. */ -#define MACH64_MASK_VT 0x00000001 /* NON-GUI MEMORY MAPPED Registers - expressed in BYTE offsets */ @@ -376,15 +374,6 @@ struct mach64_info { #define MEM_BNDRY_1M 0x00030000 #define MEM_BNDRY_EN 0x00040000 -/* ATI PCI constants */ -#define PCI_ATI_VENDOR_ID 0x1002 -#define PCI_MACH64_GX 0x4758 -#define PCI_MACH64_CX 0x4358 -#define PCI_MACH64_CT 0x4354 -#define PCI_MACH64_ET 0x4554 -#define PCI_MACH64_VT 0x5654 -#define PCI_MACH64_GT 0x4754 - /* CONFIG_CHIP_ID register constants */ #define CFG_CHIP_TYPE 0x0000FFFF #define CFG_CHIP_CLASS 0x00FF0000 |