From: Jeff Kirsher Date: Thu, 6 Mar 2014 05:28:06 +0000 (+0000) Subject: igb: fix warning if !CONFIG_IGB_HWMON X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b143d11a43aa7c188d53a996cdc9172e5b4b4b0;p=linux-beck.git igb: fix warning if !CONFIG_IGB_HWMON Fix warning about code defined but never used if IGB_HWMON not defined. Reported-by: Stephen Hemminger Signed-off-by: Stephen Hemminger Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 1da4e87cc879..fa36fe12e775 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -2711,6 +2711,7 @@ static const u8 e1000_emc_therm_limit[4] = { E1000_EMC_DIODE3_THERM_LIMIT }; +#ifdef CONFIG_IGB_HWMON /** * igb_get_thermal_sensor_data_generic - Gathers thermal sensor data * @hw: pointer to hardware structure @@ -2833,6 +2834,7 @@ static s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *hw) return status; } +#endif static struct e1000_mac_operations e1000_mac_ops_82575 = { .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575,