projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bdc0077) | patch
tilegx pci: fix semantic merge conflict with 3527ed81c
authorChris Metcalf <cmetcalf@tilera.com>
Wed, 25 Jul 2012 19:40:50 +0000 (15:40 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Wed, 25 Jul 2012 22:22:18 +0000 (18:22 -0400)
commitd41ca6dfea695777abfa35eaec863bfe2434ca54
tree21d8ad5ae2bfb6e6d9e51205756d3a9ef55d9128tree
parentbdc0077af574800d24318b6945cf2344e8dbb050commit | diff
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>
arch/tile/kernel/pci_gx.c diff | blob | history
MicroBlaze GIT Repository