From 08e625b23ae94665616d6c3115581421d9c8e1bc Mon Sep 17 00:00:00 2001 From: Don Skidmore Date: Fri, 18 Feb 2011 19:29:46 +0000 Subject: [PATCH] --- yaml --- r: 237565 b: refs/heads/master c: b60c5dd31b053d008110a80aa4089d64cee60e8f h: refs/heads/master i: 237563: 3544aea6effeabd66f68b2a1dce8ca2dd61e9666 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_x540.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 462958fb8085..13a1bf2b8e57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c700f4e6f55c42c9aeacf365bd178f97625e00df +refs/heads/master: b60c5dd31b053d008110a80aa4089d64cee60e8f diff --git a/trunk/drivers/net/ixgbe/ixgbe_x540.c b/trunk/drivers/net/ixgbe/ixgbe_x540.c index a6f06d59a64a..3229398630f6 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_x540.c +++ b/trunk/drivers/net/ixgbe/ixgbe_x540.c @@ -712,7 +712,7 @@ static struct ixgbe_phy_operations phy_ops_X540 = { .identify = &ixgbe_identify_phy_generic, .identify_sfp = &ixgbe_identify_sfp_module_generic, .init = NULL, - .reset = &ixgbe_reset_phy_generic, + .reset = NULL, .read_reg = &ixgbe_read_phy_reg_generic, .write_reg = &ixgbe_write_phy_reg_generic, .setup_link = &ixgbe_setup_phy_link_generic,