From c7e1141cfe3894f71c8969b1e6c04dd04bfdf736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=F8gsberg?= Date: Sun, 17 Dec 2006 14:34:09 -0500 Subject: [PATCH] --- yaml --- r: 47308 b: refs/heads/master c: dcb71129841e5821c0cbbdd4017a6f202f180108 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 4 +--- trunk/include/linux/pci_ids.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 51a1c93195e0..d8e59419a711 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0749aaab4975d741e124c139d40f00853a451f7f +refs/heads/master: dcb71129841e5821c0cbbdd4017a6f202f180108 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index 628130a58af3..380212573fb5 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/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/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 3d1d21035dec..c0ced96656c5 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/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