git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
sun
/
sunhme.c
diff --git
a/drivers/net/ethernet/sun/sunhme.c
b/drivers/net/ethernet/sun/sunhme.c
index
c517dac
..
cf14ab9
100644
(file)
--- a/
drivers/net/ethernet/sun/sunhme.c
+++ b/
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) {