diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 13:25:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 13:25:38 -0500 |
| commit | 64106104dd2d4a6280777e88c1cbf9f7a52c30bd (patch) | |
| tree | 082ed0f5e8be5390e867e4078e6813c509c5e642 /include | |
| parent | beda9f3a13bbb22cde92a45f230a02ef2afef6a9 (diff) | |
| parent | 91efa462054d44ae52b0c6c8325ed5e899f2cd17 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix host device registering when nodemgr disabled
ieee1394: video1394: DMA fix
ieee1394: raw1394: prevent unloading of low-level driver
ieee1394: dv1394: tidy up card removal
ieee1394: dv1394: fix CardBus card ejection
ieee1394: sbp2: lower block queue alignment requirement
ieee1394: sbp2: remove bogus "emulated" host flag
ieee1394: save one word in struct hpsb_host
ieee1394: restore config ROM when resuming
ieee1394: ohci1394: drop pcmcia-cs compatibility code
ieee1394: nodemgr: check info_length in ROM header earlier
the scheduled IEEE1394_OUI_DB removal
the scheduled IEEE1394_EXPORT_FULL_API removal
ieee1394: sbp2: use a better wildcard for blacklist
Add PCI class ID for firewire OHCI controllers.
ieee1394: modified csr1212_key_id_type_map to support lisight
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 920d21e021b6..6252cb9092dd 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -95,6 +95,7 @@ | |||
| 95 | 95 | ||
| 96 | #define PCI_BASE_CLASS_SERIAL 0x0c | 96 | #define PCI_BASE_CLASS_SERIAL 0x0c |
| 97 | #define PCI_CLASS_SERIAL_FIREWIRE 0x0c00 | 97 | #define PCI_CLASS_SERIAL_FIREWIRE 0x0c00 |
| 98 | #define PCI_CLASS_SERIAL_FIREWIRE_OHCI 0x0c0010 | ||
| 98 | #define PCI_CLASS_SERIAL_ACCESS 0x0c01 | 99 | #define PCI_CLASS_SERIAL_ACCESS 0x0c01 |
| 99 | #define PCI_CLASS_SERIAL_SSA 0x0c02 | 100 | #define PCI_CLASS_SERIAL_SSA 0x0c02 |
| 100 | #define PCI_CLASS_SERIAL_USB 0x0c03 | 101 | #define PCI_CLASS_SERIAL_USB 0x0c03 |