3 files changed, 4 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index b604926401f5..723972bb5bd9 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
         for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;
              pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {
                 u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
-                if (id == PCI_CAP_ID_HT_IRQCONF) {
+                if (id == PCI_CAP_ID_HT) {
                         id = readb(devbase + pos + 3);
                         if (id == 0x80)
                                 break;
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index bf2455a6d562..5c9b509e40e4 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -742,7 +742,6 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd)
         return 0;
 }
 
-#define HT_CAPABILITY_ID   0x08 /* HT capabilities not defined in kernel */
 #define HT_INTR_DISC_CONFIG  0x80       /* HT interrupt and discovery cap */
 #define HT_INTR_REG_INDEX    2  /* intconfig requires indirect accesses */
 
@@ -973,7 +972,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
          * do this early, before we ever enable errors or hardware errors,
          * mostly to avoid causing the chip to enter freeze mode.
          */
-        pos = pci_find_capability(pdev, HT_CAPABILITY_ID);
+        pos = pci_find_capability(pdev, PCI_CAP_ID_HT);
         if (!pos) {
                 ipath_dev_err(dd, "Couldn't find HyperTransport "
                               "capability; no interrupts\n");
@@ -996,7 +995,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
                 else if (cap_type == HT_INTR_DISC_CONFIG)
                         ihandler = set_int_handler(dd, pdev, pos);
         } while ((pos = pci_find_next_capability(pdev, pos,
-                                                 HT_CAPABILITY_ID)));
+                                                 PCI_CAP_ID_HT)));
 
         if (!ihandler) {
                 ipath_dev_err(dd, "Couldn't find interrupt handler in "
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 96930cb5927c..7d0e26cba420 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -196,7 +196,7 @@
 #define  PCI_CAP_ID_MSI         0x05    /* Message Signalled Interrupts */
 #define  PCI_CAP_ID_CHSWP       0x06    /* CompactPCI HotSwap */
 #define  PCI_CAP_ID_PCIX        0x07    /* PCI-X */
-#define  PCI_CAP_ID_HT_IRQCONF  0x08    /* HyperTransport IRQ Configuration */
+#define  PCI_CAP_ID_HT          0x08    /* HyperTransport */
 #define  PCI_CAP_ID_VNDR        0x09    /* Vendor specific capability */
 #define  PCI_CAP_ID_SHPC        0x0C    /* PCI Standard Hot-Plug Controller */
 #define  PCI_CAP_ID_EXP         0x10    /* PCI Express */