Signed-off-by: Andrew Morton --- arch/powerpc/sysdev/mpic.c | 2 +- include/linux/pci_regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/powerpc/sysdev/mpic.c~gregkh-pci-msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht arch/powerpc/sysdev/mpic.c --- a/arch/powerpc/sysdev/mpic.c~gregkh-pci-msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht +++ a/arch/powerpc/sysdev/mpic.c @@ -249,7 +249,7 @@ static void __init mpic_scan_ht_pic(stru 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 -puN include/linux/pci_regs.h~gregkh-pci-msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht include/linux/pci_regs.h --- a/include/linux/pci_regs.h~gregkh-pci-msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht +++ a/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 */ _