Commit 589a1b07 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/yijing-pci_is_pcie-v2' into next 

* pci/yijing-pci_is_pcie-v2:
  powerpc/pci: Use pci_is_pcie() to simplify code [fix]
parents 33de1b8b 9437eca1

arch/powerpc/kernel/eeh.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len) 
		       "EEH: PCI-E capabilities and status follow:\n");



		for (i=0; i<=8; i++) {

			eeh_ops->read_config(dn, cap+4*i, 4, &cfg);

			eeh_ops->read_config(dn, dev->pcie_cap+4*i, 4, &cfg);

			n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);

			printk(KERN_WARNING "EEH: PCI-E %02x: %08x\n", i, cfg);

		}