diff options
| author | Matthew Vick <matthew.vick@intel.com> | 2012-08-10 05:40:43 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-09-17 02:04:05 -0700 |
| commit | 3c89f6d0d4aa92ff252c17f8f6b5c8983ae2b77e (patch) | |
| tree | bad0f3f664d52709fd942e81296bf5ed565f494a /drivers/net/ethernet/intel/igb/igb_ethtool.c | |
| parent | ba01dfe18241bf89b058fd8a60218b218ad2bb30 (diff) | |
igb: Tidy up wrapping for CONFIG_IGB_PTP.
For users without CONFIG_IGB_PTP=y, we should not be compiling any PTP
code into the driver. Tidy up the wrapping in igb to support this.
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index a2944412a55e..0c4e29aa24c7 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2338,8 +2338,8 @@ static int igb_ethtool_get_ts_info(struct net_device *dev, return 0; } +#endif /* CONFIG_IGB_PTP */ -#endif static const struct ethtool_ops igb_ethtool_ops = { .get_settings = igb_get_settings, .set_settings = igb_set_settings, @@ -2370,7 +2370,7 @@ static const struct ethtool_ops igb_ethtool_ops = { .complete = igb_ethtool_complete, #ifdef CONFIG_IGB_PTP .get_ts_info = igb_ethtool_get_ts_info, -#endif +#endif /* CONFIG_IGB_PTP */ }; void igb_set_ethtool_ops(struct net_device *netdev) |