aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:22:16 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:22:16 -0700
commitfee02f80e68abbcc45ed3c5dd5ed09d04a284791 (patch)
tree6858df38d1fa451d8ce309fc8c238a6bc71f7629 /include
parent4f58802fae8a51d9e79454746584175c14f84519 (diff)
parented7fce6c13bdd802817e1988d67047d432e7e30b (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
Diffstat (limited to 'include')
-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 18f734ec918..b8b4ebf9abf 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -874,6 +874,7 @@
#define PCI_DEVICE_ID_APPLE_KL_USB_P 0x0026
#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P 0x0027
#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15 0x002d
+#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15 0x002e
#define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030
#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032
#define PCI_DEVIEC_ID_APPLE_UNI_N_ATA 0x0033