summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci-common.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-11-25 05:25:39 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-11-25 05:25:39 +0100
commit56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch)
treefc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/kernel/pci-common.c
parentpowerpc/mpic: Remove extra semicolon. (diff)
parentdrivers/serial/ucc_uart.c: Add missing call to init UCC UART port timeout (diff)
downloadlinux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.xz
linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r--arch/powerpc/kernel/pci-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 8f428fff545f..9bffc028f45a 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1759,10 +1759,13 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)
static void fixup_hide_host_resource_fsl(struct pci_dev *dev)
{
int i, class = dev->class >> 8;
+ /* When configured as agent, programing interface = 1 */
+ int prog_if = dev->class & 0xf;
if ((class == PCI_CLASS_PROCESSOR_POWERPC ||
class == PCI_CLASS_BRIDGE_OTHER) &&
(dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&
+ (prog_if == 0) &&
(dev->bus->parent == NULL)) {
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
dev->resource[i].start = 0;