diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /drivers/net/sfc/net_driver.h | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 2e6fd89f2a72..4762c91cb587 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
| @@ -830,7 +830,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx) | |||
| 830 | 830 | ||
| 831 | static inline unsigned int efx_port_num(struct efx_nic *efx) | 831 | static inline unsigned int efx_port_num(struct efx_nic *efx) |
| 832 | { | 832 | { |
| 833 | return PCI_FUNC(efx->pci_dev->devfn); | 833 | return efx->net_dev->dev_id; |
| 834 | } | 834 | } |
| 835 | 835 | ||
| 836 | /** | 836 | /** |