Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 10158286e7b5347dce2285895c95419b9f6f8b63

Authored by Tom 'spot' Callaway
Committed by David S. Miller
1 parent 8e293ada7d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 5 changed files with 53 additions and 15 deletions Side-by-side Diff

drivers/net/sunbmac.c
Diff comments   View file @ 1015828
... ... @@ -37,9 +37,19 @@
37 37  
38 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 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";
42 47  
  48 +MODULE_VERSION(DRV_VERSION);
  49 +MODULE_AUTHOR(DRV_AUTHOR);
  50 +MODULE_DESCRIPTION("Sun BigMAC 100baseT ethernet driver");
  51 +MODULE_LICENSE("GPL");
  52 +
43 53 #undef DEBUG_PROBE
44 54 #undef DEBUG_TX
45 55 #undef DEBUG_IRQ
... ... @@ -1321,5 +1331,4 @@
1321 1331  
1322 1332 module_init(bigmac_probe);
1323 1333 module_exit(bigmac_cleanup);
1324   -MODULE_LICENSE("GPL");
drivers/net/sunhme.c
Diff comments   View file @ 1015828
... ... @@ -13,9 +13,6 @@
13 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 16 #include <linux/config.h>
20 17 #include <linux/module.h>
21 18 #include <linux/kernel.h>
22 19  
23 20  
24 21  
... ... @@ -67,15 +64,24 @@
67 64  
68 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)"
70 71  
71   -#define DRV_NAME "sunhme"
  72 +static char version[] =
  73 + DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
72 74  
  75 +MODULE_VERSION(DRV_VERSION);
  76 +MODULE_AUTHOR(DRV_AUTHOR);
  77 +MODULE_DESCRIPTION("Sun HappyMealEthernet(HME) 10/100baseT ethernet driver");
  78 +MODULE_LICENSE("GPL");
  79 +
73 80 static int macaddr[6];
74 81  
75 82 /* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */
76 83 module_param_array(macaddr, int, NULL, 0);
77 84 MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set");
78   -MODULE_LICENSE("GPL");
79 85  
80 86 static struct happy_meal *root_happy_dev;
81 87  
drivers/net/sunlance.c
Diff comments   View file @ 1015828
... ... @@ -69,9 +69,6 @@
69 69  
70 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 72 static char lancestr[] = "LANCE";
76 73  
77 74 #include <linux/config.h>
... ... @@ -108,6 +105,19 @@
108 105 #include <asm/auxio.h> /* For tpe-link-test? setting */
109 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 121 /* Define: 2^4 Tx buffers and 2^4 Rx buffers */
112 122 #ifndef LANCE_LOG_TX_BUFFERS
113 123 #define LANCE_LOG_TX_BUFFERS 4
... ... @@ -1611,5 +1621,4 @@
1611 1621  
1612 1622 module_init(sparc_lance_probe);
1613 1623 module_exit(sparc_lance_cleanup);
1614   -MODULE_LICENSE("GPL");
... ... @@ -7,9 +7,6 @@
7 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 10 #include <linux/module.h>
14 11 #include <linux/kernel.h>
15 12 #include <linux/types.h>
... ... @@ -43,6 +40,19 @@
43 40  
44 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 56 static struct sunqec *root_qec_dev;
47 57  
48 58 static void qe_set_multicast(struct net_device *dev);
... ... @@ -1040,5 +1050,4 @@
1040 1050  
1041 1051 module_init(qec_probe);
1042 1052 module_exit(qec_cleanup);
1043   -MODULE_LICENSE("GPL");
... ... @@ -49,6 +49,8 @@
49 49 #include <scsi/scsi_host.h>
50 50 #include <scsi/scsi_tcq.h>
51 51  
  52 +#define DRV_VERSION "1.101"
  53 +
52 54 #define DEBUG_ESP
53 55 /* #define DEBUG_ESP_HME */
54 56 /* #define DEBUG_ESP_DATA */
55 57  
... ... @@ -4398,5 +4400,8 @@
4398 4400  
4399 4401 #include "scsi_module.c"
4400 4402  
  4403 +MODULE_DESCRIPTION("EnhancedScsiProcessor Sun SCSI driver");
  4404 +MODULE_AUTHOR("David S. Miller (davem@redhat.com)");
4401 4405 MODULE_LICENSE("GPL");
  4406 +MODULE_VERSION(DRV_VERSION);