---

yaml --- r: 132218 b: refs/heads/master c: 0796e75 h: refs/heads/master v: v3
git-mirror · Mar 9, 2009 · 10e7283 · 10e7283
1 parent 5eae2c8
commit 10e7283
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0cac39e4ec8097e4c7099d291b1fdcc0fe56b58
+refs/heads/master: 0796e75503adc6b0a119493ce2e599fb5fd8f96e
diff --git a/trunk/drivers/net/sunhme.c b/trunk/drivers/net/sunhme.c
@@ -2630,8 +2630,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
 	int err = -ENODEV;
 
 	sbus_dp = to_of_device(op->dev.parent)->node;
-	if (is_qfe)
-		sbus_dp = to_of_device(op->dev.parent->parent)->node;
 
 	/* We can match PCI devices too, do not accept those here. */
 	if (strcmp(sbus_dp->name, "sbus"))