diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 19:02:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 19:02:45 +0100 |
| commit | cad6a84a3913bc2d8a7ebb183e385dd6a2b76438 (patch) | |
| tree | 88caf0cfccdbac8b6d4a7840c57e56f06d7c5bb3 | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conve... (diff) | |
| download | linux-cad6a84a3913bc2d8a7ebb183e385dd6a2b76438.tar.xz linux-cad6a84a3913bc2d8a7ebb183e385dd6a2b76438.zip | |
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) } SET_MODULE_OWNER(dev); +#if 0 + /* FIXME - Is this the correct parent device anyway? */ SET_NETDEV_DEV(dev, &host->device); +#endif priv = netdev_priv(dev); |