diff options
author | Mark Einon <mark.einon@gmail.com> | 2011-10-07 17:53:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 12:08:23 -0400 |
commit | b6f4160c4e5a1565fbb06976233e6482c16a489c (patch) | |
tree | 2e225f72348f03256321e3104ac4f7880e19e82c /drivers/staging/et131x | |
parent | f247be5d6b5bf5378a9cfec2e315b1ae913f8f0d (diff) |
staging: et131x: Remove file et131x_version.h
Removed defines in et131x_version.h and replaced them by actual
strings where convinient, or moved them to et131x.h
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
-rw-r--r-- | drivers/staging/et131x/et1310_eeprom.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_mac.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_pm.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_rx.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_tx.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x.h | 3 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_ethtool.c | 4 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 11 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 1 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_version.h | 75 |
12 files changed, 10 insertions, 91 deletions
diff --git a/drivers/staging/et131x/et1310_eeprom.c b/drivers/staging/et131x/et1310_eeprom.c index 747b1dc803b..20b96605e4c 100644 --- a/drivers/staging/et131x/et1310_eeprom.c +++ b/drivers/staging/et131x/et1310_eeprom.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c index b4c9df195a2..017ece7e24c 100644 --- a/drivers/staging/et131x/et1310_mac.c +++ b/drivers/staging/et131x/et1310_mac.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/init.h> | 62 | #include <linux/init.h> |
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 145ec765bea..b809dd4e527 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c index a1b72bf8467..91d47dc2ccd 100644 --- a/drivers/staging/et131x/et1310_pm.c +++ b/drivers/staging/et131x/et1310_pm.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/init.h> | 62 | #include <linux/init.h> |
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c index 600a8f10da8..814922bbff0 100644 --- a/drivers/staging/et131x/et1310_rx.c +++ b/drivers/staging/et131x/et1310_rx.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index 2ecb934a55b..cd12500a265 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h index e83223468f7..24570ca8039 100644 --- a/drivers/staging/et131x/et131x.h +++ b/drivers/staging/et131x/et131x.h | |||
@@ -48,6 +48,9 @@ | |||
48 | * | 48 | * |
49 | */ | 49 | */ |
50 | 50 | ||
51 | #define DRIVER_NAME "et131x" | ||
52 | #define DRIVER_VERSION "v2.0" | ||
53 | |||
51 | /* et131x_eeprom.c */ | 54 | /* et131x_eeprom.c */ |
52 | int et131x_init_eeprom(struct et131x_adapter *adapter); | 55 | int et131x_init_eeprom(struct et131x_adapter *adapter); |
53 | 56 | ||
diff --git a/drivers/staging/et131x/et131x_ethtool.c b/drivers/staging/et131x/et131x_ethtool.c index 903b5a0ad85..ff95a3e8cb0 100644 --- a/drivers/staging/et131x/et131x_ethtool.c +++ b/drivers/staging/et131x/et131x_ethtool.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | #include "et131x_version.h" | 18 | |
19 | #include "et131x_defs.h" | 19 | #include "et131x_defs.h" |
20 | 20 | ||
21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
@@ -181,7 +181,7 @@ static void et131x_get_drvinfo(struct net_device *netdev, | |||
181 | struct et131x_adapter *adapter = netdev_priv(netdev); | 181 | struct et131x_adapter *adapter = netdev_priv(netdev); |
182 | 182 | ||
183 | strncpy(info->driver, DRIVER_NAME, ET131X_DRVINFO_LEN); | 183 | strncpy(info->driver, DRIVER_NAME, ET131X_DRVINFO_LEN); |
184 | strncpy(info->version, DRIVER_VERSION_STRING, ET131X_DRVINFO_LEN); | 184 | strncpy(info->version, DRIVER_VERSION, ET131X_DRVINFO_LEN); |
185 | strncpy(info->bus_info, pci_name(adapter->pdev), ET131X_DRVINFO_LEN); | 185 | strncpy(info->bus_info, pci_name(adapter->pdev), ET131X_DRVINFO_LEN); |
186 | } | 186 | } |
187 | 187 | ||
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 2f03ba0437e..33e50e90b10 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c | |||
@@ -59,7 +59,6 @@ | |||
59 | * | 59 | * |
60 | */ | 60 | */ |
61 | 61 | ||
62 | #include "et131x_version.h" | ||
63 | #include "et131x_defs.h" | 62 | #include "et131x_defs.h" |
64 | 63 | ||
65 | #include <linux/pci.h> | 64 | #include <linux/pci.h> |
@@ -944,8 +943,8 @@ static void __exit et131x_cleanup_module(void) | |||
944 | module_init(et131x_init_module); | 943 | module_init(et131x_init_module); |
945 | module_exit(et131x_cleanup_module); | 944 | module_exit(et131x_cleanup_module); |
946 | 945 | ||
947 | /* Modinfo parameters (filled out using defines from et131x_version.h) */ | 946 | MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>"); |
948 | MODULE_AUTHOR(DRIVER_AUTHOR); | 947 | MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>"); |
949 | MODULE_AUTHOR(DRIVER_AUTHOR2); | 948 | MODULE_LICENSE("Dual BSD/GPL"); |
950 | MODULE_DESCRIPTION(DRIVER_INFO); | 949 | MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver " |
951 | MODULE_LICENSE(DRIVER_LICENSE); | 950 | "for the ET1310 by Agere Systems"); |
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index bccd0e53323..cf8665b1291 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c | |||
@@ -58,7 +58,6 @@ | |||
58 | * | 58 | * |
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "et131x_version.h" | ||
62 | #include "et131x_defs.h" | 61 | #include "et131x_defs.h" |
63 | 62 | ||
64 | #include <linux/init.h> | 63 | #include <linux/init.h> |
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 16373bb9f88..bcb4756c75d 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c | |||
@@ -57,7 +57,6 @@ | |||
57 | * | 57 | * |
58 | */ | 58 | */ |
59 | 59 | ||
60 | #include "et131x_version.h" | ||
61 | #include "et131x_defs.h" | 60 | #include "et131x_defs.h" |
62 | 61 | ||
63 | #include <linux/init.h> | 62 | #include <linux/init.h> |
diff --git a/drivers/staging/et131x/et131x_version.h b/drivers/staging/et131x/et131x_version.h deleted file mode 100644 index c08b5e588d2..00000000000 --- a/drivers/staging/et131x/et131x_version.h +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | /* | ||
2 | * Agere Systems Inc. | ||
3 | * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs | ||
4 | * | ||
5 | * Copyright © 2005 Agere Systems Inc. | ||
6 | * All rights reserved. | ||
7 | * http://www.agere.com | ||
8 | * | ||
9 | *------------------------------------------------------------------------------ | ||
10 | * | ||
11 | * et131x_version.h - This file provides system and device version information. | ||
12 | * | ||
13 | *------------------------------------------------------------------------------ | ||
14 | * | ||
15 | * SOFTWARE LICENSE | ||
16 | * | ||
17 | * This software is provided subject to the following terms and conditions, | ||
18 | * which you should read carefully before using the software. Using this | ||
19 | * software indicates your acceptance of these terms and conditions. If you do | ||
20 | * not agree with these terms and conditions, do not use the software. | ||
21 | * | ||
22 | * Copyright © 2005 Agere Systems Inc. | ||
23 | * All rights reserved. | ||
24 | * | ||
25 | * Redistribution and use in source or binary forms, with or without | ||
26 | * modifications, are permitted provided that the following conditions are met: | ||
27 | * | ||
28 | * . Redistributions of source code must retain the above copyright notice, this | ||
29 | * list of conditions and the following Disclaimer as comments in the code as | ||
30 | * well as in the documentation and/or other materials provided with the | ||
31 | * distribution. | ||
32 | * | ||
33 | * . Redistributions in binary form must reproduce the above copyright notice, | ||
34 | * this list of conditions and the following Disclaimer in the documentation | ||
35 | * and/or other materials provided with the distribution. | ||
36 | * | ||
37 | * . Neither the name of Agere Systems Inc. nor the names of the contributors | ||
38 | * may be used to endorse or promote products derived from this software | ||
39 | * without specific prior written permission. | ||
40 | * | ||
41 | * Disclaimer | ||
42 | * | ||
43 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
44 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | ||
45 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | ||
46 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | ||
47 | * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY | ||
48 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
49 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
50 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
51 | * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT | ||
52 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | ||
53 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
54 | * DAMAGE. | ||
55 | * | ||
56 | */ | ||
57 | |||
58 | #ifndef __ET131X_VERSION_H__ | ||
59 | #define __ET131X_VERSION_H__ | ||
60 | |||
61 | #define DRIVER_AUTHOR "Victor Soriano (vjsoriano@agere.com)" | ||
62 | #define DRIVER_AUTHOR2 "Mark Einon (mark.einon@gmail.com)" | ||
63 | #define DRIVER_LICENSE "Dual BSD/GPL" | ||
64 | #define DRIVER_DEVICE_STRING "ET1310" | ||
65 | #define DRIVER_NAME "et131x" | ||
66 | #define DRIVER_VERSION_STRING "1.2.3-lk" | ||
67 | #define DRIVER_VENDOR "Agere Systems, http://www.agere.com" | ||
68 | #define DRIVER_DESC "10/100/1000 Base-T Ethernet Driver" | ||
69 | |||
70 | #define DRIVER_INFO DRIVER_DESC " for the "\ | ||
71 | DRIVER_DEVICE_STRING ", v" \ | ||
72 | DRIVER_VERSION_STRING " by " \ | ||
73 | DRIVER_VENDOR | ||
74 | |||
75 | #endif /* __ET131X_VERSION_H__ */ | ||