tile pci build fixes for 3.6-rc1

Linus,

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git stable

This fixes a couple of issues with the pci_bus.subordinate removal from pci-next as it affected the tile architecture. One commit does the bombing for tilegx PCI (added during the merge window, so missed the pci-next bombing) and the other commit undoes a buggy part of the bombing for tilepro PCI. Thanks!

Chris Metcalf (2):
tilegx pci: fix semantic merge conflict with 3527ed81c tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e

 arch/tile/kernel/pci.c    |    2 +-
 arch/tile/kernel/pci_gx.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Chris Metcalf, Tilera Corp.
http://www.tilera.com