diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 14:02:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 14:02:45 -0400 |
| commit | cad6a84a3913bc2d8a7ebb183e385dd6a2b76438 (patch) | |
| tree | 88caf0cfccdbac8b6d4a7840c57e56f06d7c5bb3 | |
| parent | 0ab602e5bc13e0ec6d41c0c325f005354d55b953 (diff) | |
| parent | 7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
| -rw-r--r-- | drivers/ieee1394/eth1394.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index a95313521985..03e44b337eb0 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
| @@ -584,7 +584,10 @@ static void ether1394_add_host (struct hpsb_host *host) | |||
| 584 | } | 584 | } |
| 585 | 585 | ||
| 586 | SET_MODULE_OWNER(dev); | 586 | SET_MODULE_OWNER(dev); |
| 587 | #if 0 | ||
| 588 | /* FIXME - Is this the correct parent device anyway? */ | ||
| 587 | SET_NETDEV_DEV(dev, &host->device); | 589 | SET_NETDEV_DEV(dev, &host->device); |
| 590 | #endif | ||
| 588 | 591 | ||
| 589 | priv = netdev_priv(dev); | 592 | priv = netdev_priv(dev); |
| 590 | 593 | ||