UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2007-03-23 11:02:45 -07:00
parent 0ab602e5bc 7a9eeb2fa1
commit cad6a84a39
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ieee1394/eth1394.c
View File

@ -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);