From: Chris Metcalf <cmetcalf@tilera.com>
Date: Wed, 25 Jul 2012 19:40:50 +0000 (-0400)
Subject: tilegx pci: fix semantic merge conflict with 3527ed81c
X-Git-Tag: v3.6-rc1~87^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d41ca6dfea695777abfa35eaec863bfe2434ca54;p=pandora-kernel.git

tilegx pci: fix semantic merge conflict with 3527ed81c

Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
the tile-next changes to add tilegx PCI support don't build.  This
was expected (seen in linux-next) and this one-line fix is along
the same lines as commit b918c62e for all other architectures.

Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---

Reading git-diff-tree failed