From: Ben Hutchings <bhutchings@solarflare.com>
Date: Sun, 29 Nov 2009 15:12:08 +0000 (+0000)
Subject: sfc: Rename falcon.h to nic.h
X-Git-Tag: v2.6.33-rc1~388^2~135
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=744093c98363f8a65853aed39708c9effc80f8ff;p=net-next-2.6.git

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 c49d364ebdb..97a6ebdcaf2 100644
--- 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 0a79ec7d45e..012ee31db0c 100644
--- 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 f77bbbeacb6..64b47da1232 100644
--- 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 b92decc9521..fa4d4c72ccd 100644
--- 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 19dd3ac3d1c..aa9b689cadc 100644
--- 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 643622df6e6..cd63f242698 100644
--- 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 20e627431d2..19496da3e2b 100644
--- 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 3121e242d82..65a22f193f9 100644
--- 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 3085ecfacee..e7eb30488c1 100644
--- 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 22b0e89ba8f..957e534a179 100644
--- 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 8fffd379294..03eace323d3 100644
--- 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 16258d83b70..1635f575112 100644
--- 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 8de97a9f271..ff97133c2b9 100644
--- 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 2531d0207b9..389ede43e34 100644
--- 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"
 
 /*