diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-29 10:12:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 20:23:55 -0500 |
commit | 744093c98363f8a65853aed39708c9effc80f8ff (patch) | |
tree | 174d8f888397ece9cdb933300f0045392a552109 /drivers | |
parent | c383b53729a9bbbceee132a85955d084ba00ca3a (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sfc/efx.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/falcon.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/falcon_boards.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/falcon_gmac.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/falcon_xmac.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/mdio_10g.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/mtd.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/nic.h (renamed from drivers/net/sfc/falcon.h) | 6 | ||||
-rw-r--r-- | drivers/net/sfc/qt202x_phy.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/rx.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/selftest.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/tenxpress.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/tx.c | 2 |
14 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index c49d364ebdbd..97a6ebdcaf2b 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "net_driver.h" | 23 | #include "net_driver.h" |
24 | #include "efx.h" | 24 | #include "efx.h" |
25 | #include "mdio_10g.h" | 25 | #include "mdio_10g.h" |
26 | #include "falcon.h" | 26 | #include "nic.h" |
27 | 27 | ||
28 | /************************************************************************** | 28 | /************************************************************************** |
29 | * | 29 | * |
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 0a79ec7d45ee..012ee31db0c2 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "workarounds.h" | 15 | #include "workarounds.h" |
16 | #include "selftest.h" | 16 | #include "selftest.h" |
17 | #include "efx.h" | 17 | #include "efx.h" |
18 | #include "falcon.h" | 18 | #include "nic.h" |
19 | #include "spi.h" | 19 | #include "spi.h" |
20 | #include "mdio_10g.h" | 20 | #include "mdio_10g.h" |
21 | 21 | ||
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index f77bbbeacb60..64b47da12326 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "efx.h" | 20 | #include "efx.h" |
21 | #include "mac.h" | 21 | #include "mac.h" |
22 | #include "spi.h" | 22 | #include "spi.h" |
23 | #include "falcon.h" | 23 | #include "nic.h" |
24 | #include "regs.h" | 24 | #include "regs.h" |
25 | #include "io.h" | 25 | #include "io.h" |
26 | #include "mdio_10g.h" | 26 | #include "mdio_10g.h" |
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c index b92decc9521b..fa4d4c72ccd6 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include "net_driver.h" | 12 | #include "net_driver.h" |
13 | #include "phy.h" | 13 | #include "phy.h" |
14 | #include "efx.h" | 14 | #include "efx.h" |
15 | #include "falcon.h" | 15 | #include "nic.h" |
16 | #include "regs.h" | 16 | #include "regs.h" |
17 | #include "io.h" | 17 | #include "io.h" |
18 | #include "workarounds.h" | 18 | #include "workarounds.h" |
diff --git a/drivers/net/sfc/falcon_gmac.c b/drivers/net/sfc/falcon_gmac.c index 19dd3ac3d1c7..aa9b689cadc2 100644 --- a/drivers/net/sfc/falcon_gmac.c +++ b/drivers/net/sfc/falcon_gmac.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
12 | #include "net_driver.h" | 12 | #include "net_driver.h" |
13 | #include "efx.h" | 13 | #include "efx.h" |
14 | #include "falcon.h" | 14 | #include "nic.h" |
15 | #include "mac.h" | 15 | #include "mac.h" |
16 | #include "regs.h" | 16 | #include "regs.h" |
17 | #include "io.h" | 17 | #include "io.h" |
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c index 643622df6e62..cd63f2426987 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/sfc/falcon_xmac.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
12 | #include "net_driver.h" | 12 | #include "net_driver.h" |
13 | #include "efx.h" | 13 | #include "efx.h" |
14 | #include "falcon.h" | 14 | #include "nic.h" |
15 | #include "regs.h" | 15 | #include "regs.h" |
16 | #include "io.h" | 16 | #include "io.h" |
17 | #include "mac.h" | 17 | #include "mac.h" |
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index 20e627431d27..19496da3e2bd 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "net_driver.h" | 15 | #include "net_driver.h" |
16 | #include "mdio_10g.h" | 16 | #include "mdio_10g.h" |
17 | #include "workarounds.h" | 17 | #include "workarounds.h" |
18 | #include "falcon.h" | 18 | #include "nic.h" |
19 | 19 | ||
20 | unsigned efx_mdio_id_oui(u32 id) | 20 | unsigned efx_mdio_id_oui(u32 id) |
21 | { | 21 | { |
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c index 3121e242d82e..65a22f193f92 100644 --- a/drivers/net/sfc/mtd.c +++ b/drivers/net/sfc/mtd.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "net_driver.h" | 17 | #include "net_driver.h" |
18 | #include "spi.h" | 18 | #include "spi.h" |
19 | #include "efx.h" | 19 | #include "efx.h" |
20 | #include "falcon.h" | 20 | #include "nic.h" |
21 | 21 | ||
22 | #define EFX_SPI_VERIFY_BUF_LEN 16 | 22 | #define EFX_SPI_VERIFY_BUF_LEN 16 |
23 | 23 | ||
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/nic.h index 3085ecfaceed..e7eb30488c15 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/nic.h | |||
@@ -8,8 +8,8 @@ | |||
8 | * by the Free Software Foundation, incorporated herein by reference. | 8 | * by the Free Software Foundation, incorporated herein by reference. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef EFX_FALCON_H | 11 | #ifndef EFX_NIC_H |
12 | #define EFX_FALCON_H | 12 | #define EFX_NIC_H |
13 | 13 | ||
14 | #include <linux/i2c-algo-bit.h> | 14 | #include <linux/i2c-algo-bit.h> |
15 | #include "net_driver.h" | 15 | #include "net_driver.h" |
@@ -235,4 +235,4 @@ extern void efx_nic_generate_event(struct efx_channel *channel, | |||
235 | 235 | ||
236 | extern void falcon_poll_xmac(struct efx_nic *efx); | 236 | extern void falcon_poll_xmac(struct efx_nic *efx); |
237 | 237 | ||
238 | #endif /* EFX_FALCON_H */ | 238 | #endif /* EFX_NIC_H */ |
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c index 22b0e89ba8f2..957e534a1797 100644 --- a/drivers/net/sfc/qt202x_phy.c +++ b/drivers/net/sfc/qt202x_phy.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "efx.h" | 15 | #include "efx.h" |
16 | #include "mdio_10g.h" | 16 | #include "mdio_10g.h" |
17 | #include "phy.h" | 17 | #include "phy.h" |
18 | #include "falcon.h" | 18 | #include "nic.h" |
19 | 19 | ||
20 | #define QT202X_REQUIRED_DEVS (MDIO_DEVS_PCS | \ | 20 | #define QT202X_REQUIRED_DEVS (MDIO_DEVS_PCS | \ |
21 | MDIO_DEVS_PMAPMD | \ | 21 | MDIO_DEVS_PMAPMD | \ |
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c index 8fffd3792947..03eace323d31 100644 --- a/drivers/net/sfc/rx.c +++ b/drivers/net/sfc/rx.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <net/checksum.h> | 17 | #include <net/checksum.h> |
18 | #include "net_driver.h" | 18 | #include "net_driver.h" |
19 | #include "efx.h" | 19 | #include "efx.h" |
20 | #include "falcon.h" | 20 | #include "nic.h" |
21 | #include "selftest.h" | 21 | #include "selftest.h" |
22 | #include "workarounds.h" | 22 | #include "workarounds.h" |
23 | 23 | ||
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index 16258d83b703..1635f5751127 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include "net_driver.h" | 22 | #include "net_driver.h" |
23 | #include "efx.h" | 23 | #include "efx.h" |
24 | #include "falcon.h" | 24 | #include "nic.h" |
25 | #include "selftest.h" | 25 | #include "selftest.h" |
26 | #include "workarounds.h" | 26 | #include "workarounds.h" |
27 | #include "spi.h" | 27 | #include "spi.h" |
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index 8de97a9f2719..ff97133c2b92 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
13 | #include "efx.h" | 13 | #include "efx.h" |
14 | #include "mdio_10g.h" | 14 | #include "mdio_10g.h" |
15 | #include "falcon.h" | 15 | #include "nic.h" |
16 | #include "phy.h" | 16 | #include "phy.h" |
17 | #include "regs.h" | 17 | #include "regs.h" |
18 | #include "workarounds.h" | 18 | #include "workarounds.h" |
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c index 2531d0207b96..389ede43e34a 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/sfc/tx.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/highmem.h> | 16 | #include <linux/highmem.h> |
17 | #include "net_driver.h" | 17 | #include "net_driver.h" |
18 | #include "efx.h" | 18 | #include "efx.h" |
19 | #include "falcon.h" | 19 | #include "nic.h" |
20 | #include "workarounds.h" | 20 | #include "workarounds.h" |
21 | 21 | ||
22 | /* | 22 | /* |