diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 19:22:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 19:22:16 -0400 |
| commit | fee02f80e68abbcc45ed3c5dd5ed09d04a284791 (patch) | |
| tree | 6858df38d1fa451d8ce309fc8c238a6bc71f7629 /include | |
| parent | 4f58802fae8a51d9e79454746584175c14f84519 (diff) | |
| parent | ed7fce6c13bdd802817e1988d67047d432e7e30b (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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 18f734ec9181..b8b4ebf9abf1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -874,6 +874,7 @@ | |||
| 874 | #define PCI_DEVICE_ID_APPLE_KL_USB_P 0x0026 | 874 | #define PCI_DEVICE_ID_APPLE_KL_USB_P 0x0026 |
| 875 | #define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P 0x0027 | 875 | #define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P 0x0027 |
| 876 | #define PCI_DEVICE_ID_APPLE_UNI_N_AGP15 0x002d | 876 | #define PCI_DEVICE_ID_APPLE_UNI_N_AGP15 0x002d |
| 877 | #define PCI_DEVICE_ID_APPLE_UNI_N_PCI15 0x002e | ||
| 877 | #define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030 | 878 | #define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030 |
| 878 | #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032 | 879 | #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032 |
| 879 | #define PCI_DEVIEC_ID_APPLE_UNI_N_ATA 0x0033 | 880 | #define PCI_DEVIEC_ID_APPLE_UNI_N_ATA 0x0033 |