From 10e7283eedf4ae947dccc3798e12ad923cddf84d Mon Sep 17 00:00:00 2001 From: Friedrich Oslage Date: Sun, 8 Mar 2009 20:13:42 -0700 Subject: [PATCH] --- yaml --- r: 132218 b: refs/heads/master c: 0796e75503adc6b0a119493ce2e599fb5fd8f96e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sunhme.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 467a4519631f..c9176d02b081 100644 --- 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 index cc4013be5e18..0ff837a9c804 100644 --- 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"))