diff options
| author | Friedrich Oslage <bluebird@gentoo.org> | 2009-03-08 23:13:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-08 23:13:42 -0400 |
| commit | 0796e75503adc6b0a119493ce2e599fb5fd8f96e (patch) | |
| tree | f82098185e2382bf1458776b1ba3dc48a7316608 /drivers/net/sunhme.c | |
| parent | d0cac39e4ec8097e4c7099d291b1fdcc0fe56b58 (diff) | |
sunhme: Fix qfe parent detection.
Signed-off-by: Friedrich Oslage <bluebird@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sunhme.c')
| -rw-r--r-- | drivers/net/sunhme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index cc4013be5e18..0ff837a9c804 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -2630,8 +2630,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe) | |||
| 2630 | int err = -ENODEV; | 2630 | int err = -ENODEV; |
| 2631 | 2631 | ||
| 2632 | sbus_dp = to_of_device(op->dev.parent)->node; | 2632 | sbus_dp = to_of_device(op->dev.parent)->node; |
| 2633 | if (is_qfe) | ||
| 2634 | sbus_dp = to_of_device(op->dev.parent->parent)->node; | ||
| 2635 | 2633 | ||
| 2636 | /* We can match PCI devices too, do not accept those here. */ | 2634 | /* We can match PCI devices too, do not accept those here. */ |
| 2637 | if (strcmp(sbus_dp->name, "sbus")) | 2635 | if (strcmp(sbus_dp->name, "sbus")) |