diff options
| author | Russell King | 2010-03-15 15:27:06 +0100 |
|---|---|---|
| committer | Russell King | 2010-03-15 15:27:06 +0100 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /drivers/net/benet/be.h | |
| parent | Video: ARM CLCD: Better fix for swapped IENB and CNTL registers (diff) | |
| parent | video: enable sh_mobile_lcdc on SH-Mobile ARM (diff) | |
| download | kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.tar.gz kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.tar.xz kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index be81fb2d10f7..8f0752553681 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -290,11 +290,6 @@ extern const struct ethtool_ops be_ethtool_ops; #define drvr_stats(adapter) (&adapter->stats.drvr_stats) -static inline unsigned int be_pci_func(struct be_adapter *adapter) -{ - return PCI_FUNC(adapter->pdev->devfn); -} - #define BE_SET_NETDEV_OPS(netdev, ops) (netdev->netdev_ops = ops) #define PAGE_SHIFT_4K 12 |