diff options
author | Tom 'spot' Callaway <tcallawa@redhat.com> | 2005-04-24 23:35:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-04-24 23:35:20 -0400 |
commit | 10158286e7b5347dce2285895c95419b9f6f8b63 (patch) | |
tree | 97facd71256239aea471578c42d82e97d562d5cf | |
parent | 8e293ada7d6aaee43dd56a8077b83577dd108667 (diff) |
[SPARC]: module version cleanups
Minor cleanups for sparc specific drivers (sunbmac, sunqe, sunlance,
sunhme, esp) so that they have a full module version definition that is
consistent with other upstream drivers.
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/sunbmac.c | 13 | ||||
-rw-r--r-- | drivers/net/sunhme.c | 16 | ||||
-rw-r--r-- | drivers/net/sunlance.c | 17 | ||||
-rw-r--r-- | drivers/net/sunqe.c | 17 | ||||
-rw-r--r-- | drivers/scsi/esp.c | 5 |
5 files changed, 53 insertions, 15 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 025dcd867eaa..f88f5e32b714 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -37,8 +37,18 @@ | |||
37 | 37 | ||
38 | #include "sunbmac.h" | 38 | #include "sunbmac.h" |
39 | 39 | ||
40 | #define DRV_NAME "sunbmac" | ||
41 | #define DRV_VERSION "2.0" | ||
42 | #define DRV_RELDATE "11/24/03" | ||
43 | #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" | ||
44 | |||
40 | static char version[] __initdata = | 45 | static char version[] __initdata = |
41 | "sunbmac.c:v2.0 24/Nov/03 David S. Miller (davem@redhat.com)\n"; | 46 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; |
47 | |||
48 | MODULE_VERSION(DRV_VERSION); | ||
49 | MODULE_AUTHOR(DRV_AUTHOR); | ||
50 | MODULE_DESCRIPTION("Sun BigMAC 100baseT ethernet driver"); | ||
51 | MODULE_LICENSE("GPL"); | ||
42 | 52 | ||
43 | #undef DEBUG_PROBE | 53 | #undef DEBUG_PROBE |
44 | #undef DEBUG_TX | 54 | #undef DEBUG_TX |
@@ -1321,4 +1331,3 @@ static void __exit bigmac_cleanup(void) | |||
1321 | 1331 | ||
1322 | module_init(bigmac_probe); | 1332 | module_init(bigmac_probe); |
1323 | module_exit(bigmac_cleanup); | 1333 | module_exit(bigmac_cleanup); |
1324 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index d837b3c35723..f02fe4119b2c 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -13,9 +13,6 @@ | |||
13 | * argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50 | 13 | * argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50 |
14 | */ | 14 | */ |
15 | 15 | ||
16 | static char version[] = | ||
17 | "sunhme.c:v2.02 24/Aug/2003 David S. Miller (davem@redhat.com)\n"; | ||
18 | |||
19 | #include <linux/config.h> | 16 | #include <linux/config.h> |
20 | #include <linux/module.h> | 17 | #include <linux/module.h> |
21 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
@@ -67,15 +64,24 @@ static char version[] = | |||
67 | 64 | ||
68 | #include "sunhme.h" | 65 | #include "sunhme.h" |
69 | 66 | ||
67 | #define DRV_NAME "sunhme" | ||
68 | #define DRV_VERSION "2.02" | ||
69 | #define DRV_RELDATE "8/24/03" | ||
70 | #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" | ||
71 | |||
72 | static char version[] = | ||
73 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; | ||
70 | 74 | ||
71 | #define DRV_NAME "sunhme" | 75 | MODULE_VERSION(DRV_VERSION); |
76 | MODULE_AUTHOR(DRV_AUTHOR); | ||
77 | MODULE_DESCRIPTION("Sun HappyMealEthernet(HME) 10/100baseT ethernet driver"); | ||
78 | MODULE_LICENSE("GPL"); | ||
72 | 79 | ||
73 | static int macaddr[6]; | 80 | static int macaddr[6]; |
74 | 81 | ||
75 | /* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */ | 82 | /* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */ |
76 | module_param_array(macaddr, int, NULL, 0); | 83 | module_param_array(macaddr, int, NULL, 0); |
77 | MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set"); | 84 | MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set"); |
78 | MODULE_LICENSE("GPL"); | ||
79 | 85 | ||
80 | static struct happy_meal *root_happy_dev; | 86 | static struct happy_meal *root_happy_dev; |
81 | 87 | ||
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 62d464c7ef51..b7d87d4690b4 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -69,9 +69,6 @@ | |||
69 | 69 | ||
70 | #undef DEBUG_DRIVER | 70 | #undef DEBUG_DRIVER |
71 | 71 | ||
72 | static char version[] = | ||
73 | "sunlance.c:v2.02 24/Aug/03 Miguel de Icaza (miguel@nuclecu.unam.mx)\n"; | ||
74 | |||
75 | static char lancestr[] = "LANCE"; | 72 | static char lancestr[] = "LANCE"; |
76 | 73 | ||
77 | #include <linux/config.h> | 74 | #include <linux/config.h> |
@@ -108,6 +105,19 @@ static char lancestr[] = "LANCE"; | |||
108 | #include <asm/auxio.h> /* For tpe-link-test? setting */ | 105 | #include <asm/auxio.h> /* For tpe-link-test? setting */ |
109 | #include <asm/irq.h> | 106 | #include <asm/irq.h> |
110 | 107 | ||
108 | #define DRV_NAME "sunlance" | ||
109 | #define DRV_VERSION "2.02" | ||
110 | #define DRV_RELDATE "8/24/03" | ||
111 | #define DRV_AUTHOR "Miguel de Icaza (miguel@nuclecu.unam.mx)" | ||
112 | |||
113 | static char version[] = | ||
114 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; | ||
115 | |||
116 | MODULE_VERSION(DRV_VERSION); | ||
117 | MODULE_AUTHOR(DRV_AUTHOR); | ||
118 | MODULE_DESCRIPTION("Sun Lance ethernet driver"); | ||
119 | MODULE_LICENSE("GPL"); | ||
120 | |||
111 | /* Define: 2^4 Tx buffers and 2^4 Rx buffers */ | 121 | /* Define: 2^4 Tx buffers and 2^4 Rx buffers */ |
112 | #ifndef LANCE_LOG_TX_BUFFERS | 122 | #ifndef LANCE_LOG_TX_BUFFERS |
113 | #define LANCE_LOG_TX_BUFFERS 4 | 123 | #define LANCE_LOG_TX_BUFFERS 4 |
@@ -1611,4 +1621,3 @@ static void __exit sparc_lance_cleanup(void) | |||
1611 | 1621 | ||
1612 | module_init(sparc_lance_probe); | 1622 | module_init(sparc_lance_probe); |
1613 | module_exit(sparc_lance_cleanup); | 1623 | module_exit(sparc_lance_cleanup); |
1614 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index 37ef1b82a6cb..1f2323be60d4 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c | |||
@@ -7,9 +7,6 @@ | |||
7 | * Copyright (C) 1996, 1999, 2003 David S. Miller (davem@redhat.com) | 7 | * Copyright (C) 1996, 1999, 2003 David S. Miller (davem@redhat.com) |
8 | */ | 8 | */ |
9 | 9 | ||
10 | static char version[] = | ||
11 | "sunqe.c:v3.0 8/24/03 David S. Miller (davem@redhat.com)\n"; | ||
12 | |||
13 | #include <linux/module.h> | 10 | #include <linux/module.h> |
14 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
15 | #include <linux/types.h> | 12 | #include <linux/types.h> |
@@ -43,6 +40,19 @@ static char version[] = | |||
43 | 40 | ||
44 | #include "sunqe.h" | 41 | #include "sunqe.h" |
45 | 42 | ||
43 | #define DRV_NAME "sunqe" | ||
44 | #define DRV_VERSION "3.0" | ||
45 | #define DRV_RELDATE "8/24/03" | ||
46 | #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" | ||
47 | |||
48 | static char version[] = | ||
49 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; | ||
50 | |||
51 | MODULE_VERSION(DRV_VERSION); | ||
52 | MODULE_AUTHOR(DRV_AUTHOR); | ||
53 | MODULE_DESCRIPTION("Sun QuadEthernet 10baseT SBUS card driver"); | ||
54 | MODULE_LICENSE("GPL"); | ||
55 | |||
46 | static struct sunqec *root_qec_dev; | 56 | static struct sunqec *root_qec_dev; |
47 | 57 | ||
48 | static void qe_set_multicast(struct net_device *dev); | 58 | static void qe_set_multicast(struct net_device *dev); |
@@ -1040,4 +1050,3 @@ static void __exit qec_cleanup(void) | |||
1040 | 1050 | ||
1041 | module_init(qec_probe); | 1051 | module_init(qec_probe); |
1042 | module_exit(qec_cleanup); | 1052 | module_exit(qec_cleanup); |
1043 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index d8ab73b68031..891f97f7881e 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c | |||
@@ -49,6 +49,8 @@ | |||
49 | #include <scsi/scsi_host.h> | 49 | #include <scsi/scsi_host.h> |
50 | #include <scsi/scsi_tcq.h> | 50 | #include <scsi/scsi_tcq.h> |
51 | 51 | ||
52 | #define DRV_VERSION "1.101" | ||
53 | |||
52 | #define DEBUG_ESP | 54 | #define DEBUG_ESP |
53 | /* #define DEBUG_ESP_HME */ | 55 | /* #define DEBUG_ESP_HME */ |
54 | /* #define DEBUG_ESP_DATA */ | 56 | /* #define DEBUG_ESP_DATA */ |
@@ -4398,5 +4400,8 @@ static struct scsi_host_template driver_template = { | |||
4398 | 4400 | ||
4399 | #include "scsi_module.c" | 4401 | #include "scsi_module.c" |
4400 | 4402 | ||
4403 | MODULE_DESCRIPTION("EnhancedScsiProcessor Sun SCSI driver"); | ||
4404 | MODULE_AUTHOR("David S. Miller (davem@redhat.com)"); | ||
4401 | MODULE_LICENSE("GPL"); | 4405 | MODULE_LICENSE("GPL"); |
4406 | MODULE_VERSION(DRV_VERSION); | ||
4402 | 4407 | ||