diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
| commit | 26ba2a7a9f4d8921f095af646a7d22c15a148028 (patch) | |
| tree | 1e694da6999653551bc61eb9cc6db2eb4645fcd1 /include/linux | |
| parent | [libata] ata_timing fix (diff) | |
| parent | Linux v2.6.14 (diff) | |
| download | linux-dev-26ba2a7a9f4d8921f095af646a7d22c15a148028.tar.xz linux-dev-26ba2a7a9f4d8921f095af646a7d22c15a148028.zip | |
Merge branch 'master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f74ed9462475..71834f05504f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -723,6 +723,7 @@ #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282 #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 #define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301 +#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a #define PCI_DEVICE_ID_HP_CISS 0x3210 #define PCI_DEVICE_ID_HP_CISSA 0x3220 #define PCI_DEVICE_ID_HP_CISSB 0x3222 @@ -2696,6 +2697,7 @@ #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 +#define PCI_SUBDEVICE_ID_EXSYS_4055 0x4055 #define PCI_VENDOR_ID_TIGERJET 0xe159 #define PCI_DEVICE_ID_TIGERJET_300 0x0001 |