Re: 2.6.7-rc2-mm1 - bk-netdev.patch e1000_ethtool.c doesn't build

[Paul Jackson]

> There may or may not be other errors past this ...

There are other errors - many more such duplicated and near-duplicated
lines, such as for one example the following.  Someone's shotgun
misfired and hit someone's foot.

@@ -1440,8 +1554,10 @@

 static void
 e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+e1000_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
 	struct e1000_adapter *adapter = netdev->priv;
+	struct e1000_adapter *adapter = netdev_priv(dev);
 	struct e1000_hw *hw = &adapter->hw;

 	switch(adapter->hw.device_id) {

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@xxxxxxx> 1.650.933.1373
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/