diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2012-07-25 15:40:50 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-07-25 18:22:18 -0400 |
| commit | d41ca6dfea695777abfa35eaec863bfe2434ca54 (patch) | |
| tree | 21d8ad5ae2bfb6e6d9e51205756d3a9ef55d9128 /fs/fuse | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (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>
Diffstat (limited to 'fs/fuse')
0 files changed, 0 insertions, 0 deletions