projects
/
platform
/
kernel
/
linux-arm64.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[platform/kernel/linux-arm64.git]
/
drivers
/
net
/
sunhme.c
diff --git
a/drivers/net/sunhme.c
b/drivers/net/sunhme.c
index
d4fb4ac
..
4e9bd38
100644
(file)
--- a/
drivers/net/sunhme.c
+++ b/
drivers/net/sunhme.c
@@
-2649,8
+2649,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"))