---

yaml --- r: 275658 b: refs/heads/master c: 59caa56 h: refs/heads/master v: v3
git-mirror · Nov 8, 2011 · 2560cb5 · 2560cb5
1 parent 2032d26
commit 2560cb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e50e705ca71db82a78a3e13fb7abf6b2171ac9c7
+refs/heads/master: 59caa5612ce916c4902c753aa61429eb76ac2b21
diff --git a/trunk/drivers/net/ethernet/sun/sunhme.c b/trunk/drivers/net/ethernet/sun/sunhme.c
@@ -2637,7 +2637,7 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i
 	sbus_dp = op->dev.parent->of_node;
 
 	/* We can match PCI devices too, do not accept those here. */
-	if (strcmp(sbus_dp->name, "sbus"))
+	if (strcmp(sbus_dp->name, "sbus") && strcmp(sbus_dp->name, "sbi"))
 		return err;
 
 	if (is_qfe) {