summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-26 06:15:27 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-26 06:15:27 -0800
commit19ea7178827a8847ee86c20dd81fbb1c3268f6ea (patch)
treea6a40c38a9a2e52eb87ad8d03b113e4648fed1c5 /include/linux
parent23139076d13d3f3d1c16337dc3e234eaf63e38e7 (diff)
parent6750ed12a4cea56183736e92e1a9d93a142231dc (diff)
Merge bk://linux-dj.bkbits.net/agpgart
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci_ids.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5b149a650793..b0242179b424 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1017,6 +1017,7 @@
#define PCI_DEVICE_ID_AL_M1531 0x1531
#define PCI_DEVICE_ID_AL_M1533 0x1533
#define PCI_DEVICE_ID_AL_M1541 0x1541
+#define PCI_DEVICE_ID_AL_M1543 0x1543
#define PCI_DEVICE_ID_AL_M1563 0x1563
#define PCI_DEVICE_ID_AL_M1621 0x1621
#define PCI_DEVICE_ID_AL_M1631 0x1631
@@ -1026,7 +1027,9 @@
#define PCI_DEVICE_ID_AL_M1647 0x1647
#define PCI_DEVICE_ID_AL_M1651 0x1651
#define PCI_DEVICE_ID_AL_M1671 0x1671
-#define PCI_DEVICE_ID_AL_M1543 0x1543
+#define PCI_DEVICE_ID_AL_M1681 0x1681
+#define PCI_DEVICE_ID_AL_M1683 0x1683
+#define PCI_DEVICE_ID_AL_M1689 0x1689
#define PCI_DEVICE_ID_AL_M3307 0x3307
#define PCI_DEVICE_ID_AL_M4803 0x5215
#define PCI_DEVICE_ID_AL_M5219 0x5219