sfc: Rename falcon.h to nic.h

nic.h is no longer specific to Falcon.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index c49d364ebdbd475d09ccc8b6867c0b48654566c9..97a6ebdcaf2bc3b0a8b5a916e864d12b8772f903 100644 (file)
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -23,7 +23,7 @@
 #include "net_driver.h"
 #include "efx.h"
 #include "mdio_10g.h"
-#include "falcon.h"
+#include "nic.h"
 
 /**************************************************************************
  *

diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 0a79ec7d45eed242c5e8bb1c2e97e9ddc7e752d3..012ee31db0c227080562866ca9965ae1660b234e 100644 (file)
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -15,7 +15,7 @@
 #include "workarounds.h"
 #include "selftest.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "spi.h"
 #include "mdio_10g.h"
 

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index f77bbbeacb602c840b7991eb91d9d93b91f153ef..64b47da123268a23328fc4440b90411e08d38fdf 100644 (file)
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -20,7 +20,7 @@
 #include "efx.h"
 #include "mac.h"
 #include "spi.h"
-#include "falcon.h"
+#include "nic.h"
 #include "regs.h"
 #include "io.h"
 #include "mdio_10g.h"

diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index b92decc9521bc4f5547b39e2aaeaef98836d9d9d..fa4d4c72ccd697845424e6ab63c9b5761cb5d7b8 100644 (file)
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -12,7 +12,7 @@
 #include "net_driver.h"
 #include "phy.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "regs.h"
 #include "io.h"
 #include "workarounds.h"

diff --git a/drivers/net/sfc/falcon_gmac.c b/drivers/net/sfc/falcon_gmac.c
index 19dd3ac3d1c70aa671beac71290ade2db534d3a3..aa9b689cadc28d0d8a588e2ae382178e68fc1532 100644 (file)
--- a/drivers/net/sfc/falcon_gmac.c
+++ b/drivers/net/sfc/falcon_gmac.c
@@ -11,7 +11,7 @@
 #include <linux/delay.h>
 #include "net_driver.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "mac.h"
 #include "regs.h"
 #include "io.h"

diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index 643622df6e629664065278a3bcd4111ff2374e5d..cd63f24269870f2a1121a57b260d7857c618848d 100644 (file)
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -11,7 +11,7 @@
 #include <linux/delay.h>
 #include "net_driver.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "regs.h"
 #include "io.h"
 #include "mac.h"

diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index 20e627431d27429958344dffde8ead9f7f4cb724..19496da3e2bde20731c124102118e9e2052831d3 100644 (file)
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -15,7 +15,7 @@
 #include "net_driver.h"
 #include "mdio_10g.h"
 #include "workarounds.h"
-#include "falcon.h"
+#include "nic.h"
 
 unsigned efx_mdio_id_oui(u32 id)
 {

diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c
index 3121e242d82e41ee99ad13c8002410705deca220..65a22f193f92c9301f237c536f19c401ca10ee3f 100644 (file)
--- a/drivers/net/sfc/mtd.c
+++ b/drivers/net/sfc/mtd.c
@@ -17,7 +17,7 @@
 #include "net_driver.h"
 #include "spi.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 
 #define EFX_SPI_VERIFY_BUF_LEN 16
 

diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/nic.h
similarity index 99%
rename from drivers/net/sfc/falcon.h
rename to drivers/net/sfc/nic.h
index 3085ecfaceed87b2dd018ab8948209ffab5a6818..e7eb30488c15a055dedb0f015e97cd1cef42f7a1 100644 (file)
--- a/drivers/net/sfc/falcon.h
+++ b/drivers/net/sfc/nic.h
@@ -8,8 +8,8 @@
  * by the Free Software Foundation, incorporated herein by reference.
  */
 
-#ifndef EFX_FALCON_H
-#define EFX_FALCON_H
+#ifndef EFX_NIC_H
+#define EFX_NIC_H
 
 #include <linux/i2c-algo-bit.h>
 #include "net_driver.h"
@@ -235,4 +235,4 @@ extern void efx_nic_generate_event(struct efx_channel *channel,
 
 extern void falcon_poll_xmac(struct efx_nic *efx);
 
-#endif /* EFX_FALCON_H */
+#endif /* EFX_NIC_H */

diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index 22b0e89ba8f284c03145c4d84b796ee6e440a71e..957e534a179723faf0d1656ba98d830872aa7ef0 100644 (file)
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -15,7 +15,7 @@
 #include "efx.h"
 #include "mdio_10g.h"
 #include "phy.h"
-#include "falcon.h"
+#include "nic.h"
 
 #define QT202X_REQUIRED_DEVS (MDIO_DEVS_PCS |          \
                              MDIO_DEVS_PMAPMD |        \

diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index 8fffd37929473df0eb3526648c78d3f801352264..03eace323d318ae495b9f3844ecc746ea3b9df23 100644 (file)
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -17,7 +17,7 @@
 #include <net/checksum.h>
 #include "net_driver.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "selftest.h"
 #include "workarounds.h"
 

diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 16258d83b703f05e7f16a6a96b005bc9af2985c2..1635f57511272ab7f686f13f63fe9fc24f158829 100644 (file)
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -21,7 +21,7 @@
 #include <asm/io.h>
 #include "net_driver.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "selftest.h"
 #include "workarounds.h"
 #include "spi.h"

diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 8de97a9f271955bb6b376dbf42c91d36a781a8fd..ff97133c2b923fe91285e0e3a9512be818fe7d27 100644 (file)
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -12,7 +12,7 @@
 #include <linux/seq_file.h>
 #include "efx.h"
 #include "mdio_10g.h"
-#include "falcon.h"
+#include "nic.h"
 #include "phy.h"
 #include "regs.h"
 #include "workarounds.h"

diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 2531d0207b96c9d873e91ffaa5f2b8e9c85488d2..389ede43e34aaaf3f0b8c9526df3734e19ff313e 100644 (file)
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -16,7 +16,7 @@
 #include <linux/highmem.h>
 #include "net_driver.h"
 #include "efx.h"
-#include "falcon.h"
+#include "nic.h"
 #include "workarounds.h"
 
 /*