diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sfc/boards.h | 15 | ||||
-rw-r--r-- | drivers/net/sfc/falcon.c | 1 | ||||
-rw-r--r-- | drivers/net/sfc/falcon.h | 2 | ||||
-rw-r--r-- | drivers/net/sfc/falcon_boards.c | 1 | ||||
-rw-r--r-- | drivers/net/sfc/falcon_xmac.c | 1 | ||||
-rw-r--r-- | drivers/net/sfc/mdio_10g.c | 1 | ||||
-rw-r--r-- | drivers/net/sfc/mdio_10g.h | 1 | ||||
-rw-r--r-- | drivers/net/sfc/selftest.c | 1 | ||||
-rw-r--r-- | drivers/net/sfc/tenxpress.c | 1 |
9 files changed, 2 insertions, 22 deletions
diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h deleted file mode 100644 index aaa72b0fea97..000000000000 --- a/drivers/net/sfc/boards.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | /**************************************************************************** | ||
2 | * Driver for Solarflare Solarstorm network controllers and boards | ||
3 | * Copyright 2007-2008 Solarflare Communications Inc. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms of the GNU General Public License version 2 as published | ||
7 | * by the Free Software Foundation, incorporated herein by reference. | ||
8 | */ | ||
9 | |||
10 | #ifndef EFX_BOARDS_H | ||
11 | #define EFX_BOARDS_H | ||
12 | |||
13 | extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); | ||
14 | |||
15 | #endif | ||
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index abc6b632df9f..eed8d1f98dd0 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "falcon_io.h" | 26 | #include "falcon_io.h" |
27 | #include "mdio_10g.h" | 27 | #include "mdio_10g.h" |
28 | #include "phy.h" | 28 | #include "phy.h" |
29 | #include "boards.h" | ||
30 | #include "workarounds.h" | 29 | #include "workarounds.h" |
31 | 30 | ||
32 | /* Falcon hardware control. | 31 | /* Falcon hardware control. |
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 77f2e0db7ca1..8d232bf612e7 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h | |||
@@ -39,6 +39,8 @@ extern struct efx_nic_type falcon_b_nic_type; | |||
39 | ************************************************************************** | 39 | ************************************************************************** |
40 | */ | 40 | */ |
41 | 41 | ||
42 | extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); | ||
43 | |||
42 | /* TX data path */ | 44 | /* TX data path */ |
43 | extern int falcon_probe_tx(struct efx_tx_queue *tx_queue); | 45 | extern int falcon_probe_tx(struct efx_tx_queue *tx_queue); |
44 | extern void falcon_init_tx(struct efx_tx_queue *tx_queue); | 46 | extern void falcon_init_tx(struct efx_tx_queue *tx_queue); |
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c index cae165665110..ab940756ac73 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include "net_driver.h" | 12 | #include "net_driver.h" |
13 | #include "phy.h" | 13 | #include "phy.h" |
14 | #include "boards.h" | ||
15 | #include "efx.h" | 14 | #include "efx.h" |
16 | #include "falcon.h" | 15 | #include "falcon.h" |
17 | #include "falcon_hwdefs.h" | 16 | #include "falcon_hwdefs.h" |
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c index bec52ca37eee..b486a2b317b5 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/sfc/falcon_xmac.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "mac.h" | 17 | #include "mac.h" |
18 | #include "mdio_10g.h" | 18 | #include "mdio_10g.h" |
19 | #include "phy.h" | 19 | #include "phy.h" |
20 | #include "boards.h" | ||
21 | #include "workarounds.h" | 20 | #include "workarounds.h" |
22 | 21 | ||
23 | /************************************************************************** | 22 | /************************************************************************** |
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index 6c33459f9ea9..b355872de6c2 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | #include "net_driver.h" | 15 | #include "net_driver.h" |
16 | #include "mdio_10g.h" | 16 | #include "mdio_10g.h" |
17 | #include "boards.h" | ||
18 | #include "workarounds.h" | 17 | #include "workarounds.h" |
19 | 18 | ||
20 | unsigned efx_mdio_id_oui(u32 id) | 19 | unsigned efx_mdio_id_oui(u32 id) |
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h index 6b14421a7444..75b37f101231 100644 --- a/drivers/net/sfc/mdio_10g.h +++ b/drivers/net/sfc/mdio_10g.h | |||
@@ -17,7 +17,6 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "efx.h" | 19 | #include "efx.h" |
20 | #include "boards.h" | ||
21 | 20 | ||
22 | static inline unsigned efx_mdio_id_rev(u32 id) { return id & 0xf; } | 21 | static inline unsigned efx_mdio_id_rev(u32 id) { return id & 0xf; } |
23 | static inline unsigned efx_mdio_id_model(u32 id) { return (id >> 4) & 0x3f; } | 22 | static inline unsigned efx_mdio_id_model(u32 id) { return (id >> 4) & 0x3f; } |
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index 817c7efc11e0..4a7be1cc5067 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "efx.h" | 24 | #include "efx.h" |
25 | #include "falcon.h" | 25 | #include "falcon.h" |
26 | #include "selftest.h" | 26 | #include "selftest.h" |
27 | #include "boards.h" | ||
28 | #include "workarounds.h" | 27 | #include "workarounds.h" |
29 | #include "spi.h" | 28 | #include "spi.h" |
30 | #include "falcon_io.h" | 29 | #include "falcon_io.h" |
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index 352cc560ed4c..f5797a3e1fe1 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include "falcon.h" | 15 | #include "falcon.h" |
16 | #include "phy.h" | 16 | #include "phy.h" |
17 | #include "falcon_hwdefs.h" | 17 | #include "falcon_hwdefs.h" |
18 | #include "boards.h" | ||
19 | #include "workarounds.h" | 18 | #include "workarounds.h" |
20 | #include "selftest.h" | 19 | #include "selftest.h" |
21 | 20 | ||