diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 08:29:51 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-24 04:26:56 -0700 |
commit | 5087b54ddc4f3a1007c0984177934c016d884639 (patch) | |
tree | 778bb1f6a7c213a03bbd08743564d4743df9b00b /drivers/net | |
parent | c9597d4f89565b6562bd3026adbe6eac6c317f47 (diff) |
sfc: Remove boards.h, moving last remaining declaration to falcon.h
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 aaa72b0fea9..00000000000 --- a/drivers/net/sfc/boards.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - * Driver for Solarflare Solarstorm network controllers and boards - * Copyright 2007-2008 Solarflare Communications Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, incorporated herein by reference. - */ - -#ifndef EFX_BOARDS_H -#define EFX_BOARDS_H - -extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); - -#endif diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index abc6b632df9..eed8d1f98dd 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -26,7 +26,6 @@ #include "falcon_io.h" #include "mdio_10g.h" #include "phy.h" -#include "boards.h" #include "workarounds.h" /* Falcon hardware control. diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 77f2e0db7ca..8d232bf612e 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; ************************************************************************** */ +extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); + /* TX data path */ extern int falcon_probe_tx(struct efx_tx_queue *tx_queue); 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 cae16566511..ab940756ac7 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c @@ -11,7 +11,6 @@ #include "net_driver.h" #include "phy.h" -#include "boards.h" #include "efx.h" #include "falcon.h" #include "falcon_hwdefs.h" diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c index bec52ca37ee..b486a2b317b 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/sfc/falcon_xmac.c @@ -17,7 +17,6 @@ #include "mac.h" #include "mdio_10g.h" #include "phy.h" -#include "boards.h" #include "workarounds.h" /************************************************************************** diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index 6c33459f9ea..b355872de6c 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c @@ -14,7 +14,6 @@ #include <linux/delay.h> #include "net_driver.h" #include "mdio_10g.h" -#include "boards.h" #include "workarounds.h" unsigned efx_mdio_id_oui(u32 id) diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h index 6b14421a744..75b37f10123 100644 --- a/drivers/net/sfc/mdio_10g.h +++ b/drivers/net/sfc/mdio_10g.h @@ -17,7 +17,6 @@ */ #include "efx.h" -#include "boards.h" static inline unsigned efx_mdio_id_rev(u32 id) { return id & 0xf; } 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 817c7efc11e..4a7be1cc506 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c @@ -24,7 +24,6 @@ #include "efx.h" #include "falcon.h" #include "selftest.h" -#include "boards.h" #include "workarounds.h" #include "spi.h" #include "falcon_io.h" diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index 352cc560ed4..f5797a3e1fe 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c @@ -15,7 +15,6 @@ #include "falcon.h" #include "phy.h" #include "falcon_hwdefs.h" -#include "boards.h" #include "workarounds.h" #include "selftest.h" |