浏览代码

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>
Kristian Hgsberg 18 年之前
父节点
当前提交
dcb7112984
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 1 3
      drivers/ieee1394/ohci1394.c
  2. 1 0
      include/linux/pci_ids.h

+ 1 - 3
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,

+ 1 - 0
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