summaryrefslogtreecommitdiffstats
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-03 17:34:54 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-03 17:34:54 -0800
commita7ec3f5289681e9d63b65db5f56857f998812b4b (patch)
tree5e779650b210df1a36f9fe5c322b55889fdbb7f9 /include/linux/pci_ids.h
parentde9e957f12d09793aac7d44ee0f7987dc8019b94 (diff)
parent7b37b064c294af350c462f77d7a9a44485a93684 (diff)
downloadop-kernel-dev-a7ec3f5289681e9d63b65db5f56857f998812b4b.zip
op-kernel-dev-a7ec3f5289681e9d63b65db5f56857f998812b4b.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] drivers/char/agp/sgi-agp.c: check kmalloc() return value [AGPGART] Fix PCI-posting flush typo. [AGPGART] fix detection of aperture size versus GTT size on G965 [AGPGART] Remove unnecessary flushes when inserting and removing pages. [AGPGART] K8M890 support for amd-k8.
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 778e701..f7a416c 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1277,6 +1277,7 @@
#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_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
#define PCI_DEVICE_ID_VIA_82C561 0x0561
OpenPOWER on IntegriCloud