diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-23 11:05:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-24 13:58:44 -0500 |
commit | 5c16a96c4f31a0be287c5db3f36d1099dea9b2bd (patch) | |
tree | 74735098537cc8d352e3beb70f79ee5c9d4f5c9b /drivers/net/sfc/falcon.h | |
parent | 278c0621fbc4ef52177969edb6f07352da816fdb (diff) |
sfc: Move definition of struct falcon_nic_data into falcon.h
This is preparation for moving Falcon-specific state required by other
Falcon-specific code.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.h')
-rw-r--r-- | drivers/net/sfc/falcon.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 54dad2de22f2..46dd43bbbfd9 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #ifndef EFX_FALCON_H | 11 | #ifndef EFX_FALCON_H |
12 | #define EFX_FALCON_H | 12 | #define EFX_FALCON_H |
13 | 13 | ||
14 | #include <linux/i2c-algo-bit.h> | ||
14 | #include "net_driver.h" | 15 | #include "net_driver.h" |
15 | #include "efx.h" | 16 | #include "efx.h" |
16 | 17 | ||
@@ -29,6 +30,16 @@ static inline int falcon_rev(struct efx_nic *efx) | |||
29 | return efx->pci_dev->revision; | 30 | return efx->pci_dev->revision; |
30 | } | 31 | } |
31 | 32 | ||
33 | /** | ||
34 | * struct falcon_nic_data - Falcon NIC state | ||
35 | * @pci_dev2: The secondary PCI device if present | ||
36 | * @i2c_data: Operations and state for I2C bit-bashing algorithm | ||
37 | */ | ||
38 | struct falcon_nic_data { | ||
39 | struct pci_dev *pci_dev2; | ||
40 | struct i2c_algo_bit_data i2c_data; | ||
41 | }; | ||
42 | |||
32 | static inline struct falcon_board *falcon_board(struct efx_nic *efx) | 43 | static inline struct falcon_board *falcon_board(struct efx_nic *efx) |
33 | { | 44 | { |
34 | return &efx->board_info; | 45 | return &efx->board_info; |