diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 22:05:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 22:05:46 -0700 |
| commit | da2def39ab0ab53286831929a4e2b691c6b63db0 (patch) | |
| tree | ae3a10743916c3cb31b6ba0db2dcb36157ed65b3 | |
| parent | 82718086b091a136047dab266c5487b07ea7cf00 (diff) | |
| parent | c684195ea577f5575dfae2b23a9de85d2f3064c6 (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 271f3eb29a60..d6e4a6ef3eb5 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1199,6 +1199,7 @@ #define PCI_DEVICE_ID_VIA_8763_0 0x0198 #define PCI_DEVICE_ID_VIA_8380_0 0x0204 #define PCI_DEVICE_ID_VIA_3238_0 0x0238 +#define PCI_DEVICE_ID_VIA_PT880 0x0258 #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 #define PCI_DEVICE_ID_VIA_3269_0 0x0269 #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 @@ -1257,7 +1258,6 @@ #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_8378_0 0x3205 #define PCI_DEVICE_ID_VIA_8783_0 0x3208 -#define PCI_DEVICE_ID_VIA_PT880 0x3258 #define PCI_DEVICE_ID_VIA_P4M400 0x3209 #define PCI_DEVICE_ID_VIA_8237 0x3227 #define PCI_DEVICE_ID_VIA_3296_0 0x0296 |