diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:50:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:50:17 +0100 |
| commit | 98014be39bda8277a5ad130bb274ed6eb18b74df (patch) | |
| tree | 974620a47c9350ff9b3c06ffd2b49470bbda72ab /drivers/net/ethernet/sun/sunhme.c | |
| parent | Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tml... (diff) | |
| parent | ARM: ux500: update defconfig (diff) | |
| download | linux-98014be39bda8277a5ad130bb274ed6eb18b74df.tar.xz linux-98014be39bda8277a5ad130bb274ed6eb18b74df.zip | |
Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes
Diffstat (limited to 'drivers/net/ethernet/sun/sunhme.c')
| -rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index c517dac02ae1..cf14ab9db576 100644 --- 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) { |