diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-12-20 22:07:30 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-12-20 22:07:30 -0800 |
| commit | 54c9a72de76a70f9cd32a3c428257526e53819d0 (patch) | |
| tree | 3d86d5a34dfb15e7aad110694f2d386d1b257cdc /include | |
| parent | 79232b1223257194cd364996a60c63dccc6107aa (diff) | |
Merged with Linus tree. Some conflicts to resolve.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fb.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 2bd9ed665889..682fe647c883 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -413,9 +413,11 @@ struct fb_info { #define fb_readb sbus_readb #define fb_readw sbus_readw #define fb_readl sbus_readl +#define fb_readq sbus_readq #define fb_writeb sbus_writeb #define fb_writew sbus_writew #define fb_writel sbus_writel +#define fb_writeq sbus_writeq #define fb_memset sbus_memset_io #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1befa5e1830b..f9945ae00d7a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -263,6 +263,43 @@ /* Radeon NV-100 */ #define PCI_DEVICE_ID_ATI_RADEON_N1 0x5159 #define PCI_DEVICE_ID_ATI_RADEON_N2 0x515a +/* Radeon R100 */ +#define PCI_DEVICE_ID_ATI_RADEON_QD 0x5144 +#define PCI_DEVICE_ID_ATI_RADEON_QE 0x5145 +#define PCI_DEVICE_ID_ATI_RADEON_QF 0x5146 +#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147 +/* Radeon RV100 (VE) */ +#define PCI_DEVICE_ID_ATI_RADEON_QY 0x5159 +#define PCI_DEVICE_ID_ATI_RADEON_QZ 0x515a +/* Radeon R200 (8500) */ +#define PCI_DEVICE_ID_ATI_RADEON_QL 0x514c +#define PCI_DEVICE_ID_ATI_RADEON_QN 0x514e +#define PCI_DEVICE_ID_ATI_RADEON_QO 0x514f +#define PCI_DEVICE_ID_ATI_RADEON_Ql 0x516c +#define PCI_DEVICE_ID_ATI_RADEON_BB 0x4242 +/* Radeon RV200 (7500) */ +#define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157 +#define PCI_DEVICE_ID_ATI_RADEON_QX 0x5158 +/* Radeon RV250 (9000) */ +#define PCI_DEVICE_ID_ATI_RADEON_Id 0x4964 +#define PCI_DEVICE_ID_ATI_RADEON_Ie 0x4965 +#define PCI_DEVICE_ID_ATI_RADEON_If 0x4966 +#define PCI_DEVICE_ID_ATI_RADEON_Ig 0x4967 +/* Radeon R300 (9700) */ +#define PCI_DEVICE_ID_ATI_RADEON_ND 0x4e44 +#define PCI_DEVICE_ID_ATI_RADEON_NE 0x4e45 +#define PCI_DEVICE_ID_ATI_RADEON_NF 0x4e46 +#define PCI_DEVICE_ID_ATI_RADEON_NG 0x4e47 +/* Radeon M6 */ +#define PCI_DEVICE_ID_ATI_RADEON_LY 0x4c59 +#define PCI_DEVICE_ID_ATI_RADEON_LZ 0x4c5a +/* Radeon M7 */ +#define PCI_DEVICE_ID_ATI_RADEON_LW 0x4c57 +#define PCI_DEVICE_ID_ATI_RADEON_LX 0x4c58 +#define PCI_DEVICE_ID_ATI_RADEON_Ld 0x4964 +#define PCI_DEVICE_ID_ATI_RADEON_Le 0x4965 +#define PCI_DEVICE_ID_ATI_RADEON_Lf 0x4966 +#define PCI_DEVICE_ID_ATI_RADEON_Lg 0x4967 /* Radeon */ #define PCI_DEVICE_ID_ATI_RADEON_RA 0x5144 #define PCI_DEVICE_ID_ATI_RADEON_RB 0x5145 |