[netdrvr] build fixes

For e1000 and baycom_epp.

Contributed by Jeff Garzik.

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 863f7527b517038fce4e250582b5b02e41000aaa..f219547510da21d803e1fc776b97a18ad8a26229 100644 (file)
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -1457,7 +1457,7 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw)
     if((ret_val = e1000_write_phy_reg(hw, PHY_CTRL, mii_ctrl_reg)))
         return ret_val;
 
-    usec_delay(1);
+    udelay(1);
 
     /* The wait_autoneg_complete flag may be a little misleading here.
      * Since we are forcing speed and duplex, Auto-Neg is not enabled.

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index c6a820c159100f642da59e482da22f4fa1c759f4..7cbeb3407b246bbbd648ebcbfeafc58224c5aa00 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1355,7 +1355,7 @@ MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 
-static void __init baycom_epp_setup(struct net_device *dev)
+static void __init baycom_epp_dev_setup(struct net_device *dev)
 {
        struct baycom_state *bc = dev->priv;
 
@@ -1384,7 +1384,7 @@ static int __init init_baycomepp(void)
                struct net_device *dev;
                
                dev = alloc_netdev(sizeof(struct baycom_state), "bce%d",
-                                  baycom_epp_setup);
+                                  baycom_epp_dev_setup);
 
                if (!dev) {
                        printk(KERN_WARNING "bce%d : out of memory\n", i);