summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-25 08:01:53 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-25 08:01:53 -0700
commit6ae26fa468533c86aaa6936fd366142fcf01386f (patch)
treee1b5df138d0a3775b6546f2437950eb4fd635d6a /include/linux
parent6869ce1c145aaea9f9f8eb8623a261d316b0cd19 (diff)
parent5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326 (diff)
downloadlinux-6ae26fa468533c86aaa6936fd366142fcf01386f.tar.gz
linux-6ae26fa468533c86aaa6936fd366142fcf01386f.tar.bz2
linux-6ae26fa468533c86aaa6936fd366142fcf01386f.zip
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: balance ioremap checks agp: Add device id for P4M900 to via-agp module efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()
Diffstat (limited to 'include/linux')
-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 f77944e432f2..06d23e10a16d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1290,6 +1290,7 @@
#define PCI_DEVICE_ID_VIA_VT3324 0x0324
#define PCI_DEVICE_ID_VIA_VT3336 0x0336
#define PCI_DEVICE_ID_VIA_VT3351 0x0351
+#define PCI_DEVICE_ID_VIA_VT3364 0x0364
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
#define PCI_DEVICE_ID_VIA_82C561 0x0561