From 97a3052b1335caba085485c2a3355ea0f0e46a6f Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 22 Feb 2012 09:02:42 +0000 Subject: [PATCH] --- yaml --- r: 290474 b: refs/heads/master c: 944ce011cfc0b261b74c36e2c1c2e725c72c72ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c97632ae12d8..5804bb4697e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 +refs/heads/master: 944ce011cfc0b261b74c36e2c1c2e725c72c72ac diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c index da89e2b73b40..fdc3be9834ac 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -3353,7 +3353,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw) hw->fc.current_mode); /* Continue to configure the copper link. */ - ret_val = e1000_setup_copper_link_ich8lan(hw); + ret_val = hw->mac.ops.setup_physical_interface(hw); if (ret_val) return ret_val;