summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2006-12-17 14:34:09 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-02-08 20:55:23 +0100
commitdcb71129841e5821c0cbbdd4017a6f202f180108 (patch)
tree5cfe1f18b9e05ef6cb1bdaa76ac1cbe2b54c1372
parent0749aaab4975d741e124c139d40f00853a451f7f (diff)
downloadop-kernel-dev-dcb71129841e5821c0cbbdd4017a6f202f180108.zip
op-kernel-dev-dcb71129841e5821c0cbbdd4017a6f202f180108.tar.gz
Add PCI class ID for firewire OHCI controllers.
Pull this define out of drivers/ieee1394/ohci1394.c and rename to match other PCI class defines. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/ohci1394.c4
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 628130a..3802125 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3634,11 +3634,9 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
}
#endif /* CONFIG_PM */
-#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
-
static struct pci_device_id ohci1394_pci_tbl[] = {
{
- .class = PCI_CLASS_FIREWIRE_OHCI,
+ .class = PCI_CLASS_SERIAL_FIREWIRE_OHCI,
.class_mask = PCI_ANY_ID,
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3d1d210..c0ced96 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -95,6 +95,7 @@
#define PCI_BASE_CLASS_SERIAL 0x0c
#define PCI_CLASS_SERIAL_FIREWIRE 0x0c00
+#define PCI_CLASS_SERIAL_FIREWIRE_OHCI 0x0c0010
#define PCI_CLASS_SERIAL_ACCESS 0x0c01
#define PCI_CLASS_SERIAL_SSA 0x0c02
#define PCI_CLASS_SERIAL_USB 0x0c03
OpenPOWER on IntegriCloud