From 24c1bfae1829147ccef0218f68919b63a497f002 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 8 Feb 2012 02:55:40 +0000 Subject: [PATCH] --- yaml --- r: 290123 b: refs/heads/master c: 3fa82936347bba431f147e23c788f6364c3e5b36 h: refs/heads/master i: 290121: 5702e38307a149384e3c5a3afaf4b9599b13080b 290119: 27ad3d9b9a7b9240e55964511135c1b8e6564e6b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e7dc7839f0fc..a21cb1aae375 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f71dde6a44c6f817a104ab8a95a2eeabac5614df +refs/heads/master: 3fa82936347bba431f147e23c788f6364c3e5b36 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c index e45235ea6126..e2c546d7dae1 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -3479,6 +3479,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw) default: break; } + return e1000e_setup_copper_link(hw); }