Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs

[karo-tx-linux.git] / drivers / of / address.c

diff --git a/drivers/of/address.c b/drivers/of/address.c
index fdd0636a987d1fe9165c0d4917d86efc8cce40c3..b55c2189076064c1d9a8015079370046ad8ae615 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
 
 static int of_bus_pci_match(struct device_node *np)
 {
-       /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */
-       return !strcmp(np->type, "pci") || !strcmp(np->type, "vci");
+       /*
+        * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
+        * "ht" is hypertransport
+        */
+       return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
+               !strcmp(np->type, "ht");
 }
 
 static void of_bus_pci_count_cells(struct device_node *np,