Merge branch 'master' of ../net-2.6/

[linux-2.6] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 240db847e1296de88d4d7077eb27c3750584603d..5586fc62468880a0df991cd72d461bf6e5ab77a3 100644 (file)
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -502,6 +502,7 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
 /*
  *TODO: do something or get rid of this
  */
+#ifdef CONFIG_PM
 static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
 {
 /*    s32 ret_val;
@@ -515,6 +516,7 @@ static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
 */
        return 0;
 }
+#endif
 
 /*
  * Resets the PHY and make all config validate
@@ -2342,15 +2344,12 @@ static irqreturn_t atl1_intr(int irq, void *data)
 {
        struct atl1_adapter *adapter = netdev_priv(data);
        u32 status;
-       u8 update_rx;
        int max_ints = 10;
 
        status = adapter->cmb.cmb->int_stats;
        if (!status)
                return IRQ_NONE;
 
-       update_rx = 0;
-
        do {
                /* clear CMB interrupt status at once */
                adapter->cmb.cmb->int_stats = 0;