diff options
| author | Linus Torvalds | 2009-03-12 17:27:53 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-03-12 17:27:53 +0100 |
| commit | f1c7404e37a8970bd58cc10a6d96534d42b9aac6 (patch) | |
| tree | c7d067f08f7ceca58f29526cb498c92e654ee400 /drivers/net | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | sunhme: Fix qfe parent detection. (diff) | |
| download | kernel-qcow2-linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.tar.gz kernel-qcow2-linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.tar.xz kernel-qcow2-linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sunhme: Fix qfe parent detection.
sparc64: Fix lost interrupts on sun4u.
sparc64: wait_event_interruptible_timeout may return -ERESTARTSYS
jsflash: stop defining MAJOR_NR
Diffstat (limited to 'drivers/net')
| -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 d4fb4acdbebd..4e9bd380a5c2 100644 --- 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")) |