diff options
| author |   Yuval Mintz <Yuval.Mintz@qlogic.com> | 2014-03-26 09:06:29 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-03-27 14:29:17 -0400 |
| commit | 19915f53af472e97d67a43b7b43f50af2830a1a8 (patch) | |
| tree | 88a1877bdb71890af9323802121eb8e8e9b6d80b /drivers | |
| parent | Merge branch 'tipc-next' (diff) | |
| download | linux-dev-19915f53af472e97d67a43b7b43f50af2830a1a8.tar.xz linux-dev-19915f53af472e97d67a43b7b43f50af2830a1a8.zip | |
bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set
Commit 370d4a26 "bnx2x: Create workqueue for IOV related tasks" breaks bnx2x
compilation when CONFIG_BNX2X_SRIOV is not set - "multiple definition of
`bnx2x_schedule_iov_task'".
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h index db73a247ecfb..8bf764570eef 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h @@ -574,7 +574,7 @@ static inline int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs) {retur static inline void bnx2x_iov_channel_down(struct bnx2x *bp) {} static inline void bnx2x_iov_task(struct work_struct *work) {} -void bnx2x_schedule_iov_task(struct bnx2x *bp, enum bnx2x_iov_flag flag) {} +static inline void bnx2x_schedule_iov_task(struct bnx2x *bp, enum bnx2x_iov_flag flag) {} #endif /* CONFIG_BNX2X_SRIOV */ #endif /* bnx2x_sriov.h */ |