diff options
| author |   Jacob Keller <jacob.e.keller@intel.com> | 2015-10-27 12:51:09 -0700 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-12-13 15:27:59 -0800 |
| commit | 5682366cecd1d40cb63f6a88dbe53349cb97e173 (patch) | |
| tree | 1ffd1d05ab348f6220b19ee3184064052cab7c85 /drivers/net/ethernet/intel/fm10k/fm10k.h | |
| parent | fm10k: bump driver version (diff) | |
| download | linux-dev-5682366cecd1d40cb63f6a88dbe53349cb97e173.tar.xz linux-dev-5682366cecd1d40cb63f6a88dbe53349cb97e173.zip | |
fm10k: conditionally compile DCB and DebugFS support
Rather than wrapping fm10k_dcbnl.c and fm10k_debugfs.c support with
#ifdef blocks, just conditionally include the .o files in the Makefile.
Also, since we're modifying it, update the copyright year on the
Makefile.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k.h')
| -rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h index 8595a3d7e142..02219d935208 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k.h +++ b/drivers/net/ethernet/intel/fm10k/fm10k.h @@ -557,5 +557,9 @@ int fm10k_get_ts_config(struct net_device *netdev, struct ifreq *ifr); int fm10k_set_ts_config(struct net_device *netdev, struct ifreq *ifr); /* DCB */ +#ifdef CONFIG_DCB void fm10k_dcbnl_set_ops(struct net_device *dev); +#else +static inline void fm10k_dcbnl_set_ops(struct net_device *dev) {} +#endif #endif /* _FM10K_H_ */ |