1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index d6b19c2780af..5f026b5d7857 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -599,10 +599,9 @@ 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
+
+        /* This used to be &host->device in Linux 2.6.20 and before. */
+        SET_NETDEV_DEV(dev, host->device.parent);
 
         priv = netdev_priv(dev);
         INIT_LIST_HEAD(&priv->ip_node_list);