diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2003-01-02 22:01:15 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2003-01-02 22:01:15 -0100 |
| commit | c1482c167b2f894d5eb67f2a9ae45954a9bbb808 (patch) | |
| tree | 19ee718b66ee748782f777dd7bd347a20a5d3054 /include/linux | |
| parent | d127326dbb20263629dd70d85f4a329bb35fbf6b (diff) | |
| parent | f0a6ec87a20db2e93065cb9bd6555e96503655ec (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/agp_backend.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index e6fa886e8d82..90890f4e9e6d 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -60,8 +60,10 @@ enum chipset_type { VIA_APOLLO_KX133, VIA_APOLLO_KT133, VIA_APOLLO_KT400, + VIA_APOLLO_KT400_3, VIA_APOLLO_PRO_266, VIA_VT8605, + VIA_P4X400, SIS_GENERIC, AMD_GENERIC, AMD_IRONGATE, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f9945ae00d7a..89874d8eeee7 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1092,6 +1092,7 @@ #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_8233A 0x3147 +#define PCI_DEVICE_ID_VIA_8235_0 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_86C100A 0x6100 |