summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 08:43:26 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 08:43:26 -0800
commit51e6ed23fc95c3e710d8a98717924ccb2571aa66 (patch)
tree2e7b2aae718de89e31384bc133e8752da642f5ae /include
parent597049ccd729e80c5eff7d907beeb58d908aac6f (diff)
parent43ed41f648554c9fecaf7597d25e05da63ec7290 (diff)
downloadlinux-51e6ed23fc95c3e710d8a98717924ccb2571aa66.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Add new IDs to VIA AGP. [AGPGART] Remove pointless assignment. [AGPGART] Remove pointless typedef in ati-agp [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages() [AGPGART] intel_agp: restore graphics device's pci space early in resume
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e642b99f9a92..3d1d21035dec 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1277,7 +1277,8 @@
#define PCI_DEVICE_ID_VIA_3296_0 0x0296
#define PCI_DEVICE_ID_VIA_8363_0 0x0305
#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314
-#define PCI_DEVICE_ID_VIA_K8M890CE 0x0336
+#define PCI_DEVICE_ID_VIA_P4M890 0x0327
+#define PCI_DEVICE_ID_VIA_VT3336 0x0336
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
#define PCI_DEVICE_ID_VIA_82C561 0x0561