2006-12-17 19:34:25

by Kristian Høgsberg

Subject: [PATCH] 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.
---
drivers/ieee1394/ohci1394.c | 4 +---
include/linux/pci_ids.h | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 6e8ea91..3bc55d4 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3584,11 +3584,9 @@ #endif /* CONFIG_PPC_PMAC */
}
#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 c09da1e..4849b26 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -95,6 +95,7 @@ #define PCI_CLASS_PROCESSOR_CO 0x0b40

#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
--
1.4.2.4

2006-12-18 14:27:32

by Stefan Richter

Subject: Re: [PATCH] Add PCI class ID for firewire OHCI controllers.

Kristian H?gsberg wrote:
> Pull this define out of drivers/ieee1394/ohci1394.c and rename to match
> other PCI class defines.

Committed to linux1394-2.6.git.
--
Stefan Richter
-=====-=-==- ==-- =--=-
http://arcgraph.de/sr/