diff options
| author | Alex Chiang <[email protected]> | 2009-05-26 20:50:12 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2009-05-26 20:50:12 -0700 |
| commit | 5ad18900355743757e7f415bcb850ea8406a13e2 (patch) | |
| tree | 81cfc6cb21f493351d346dc21a79dea7b974d641 | |
| parent | 18a36c1a398055e87a3646738abf3c1b0e98e7e2 (diff) | |
atlx: move modinfo data from atlx.h to atl1.c
Both atl1.c and atl2.c include atlx.h, which defines some modinfo
stuff. But atl2.c seems like it doesn't want the modinfo data
from atlx.h, as it defines its own.
Running modinfo on atl2.ko, we get conflicting information:
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author"
version: 2.2.3
description: Atheros Fast Ethernet Network Driver
author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]>
version: 2.1.3
author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]>
Move the modinfo data out of atlx.h and into atl1.c to eliminate
the confusion:
$ /sbin/modinfo drivers/net/atlx/atl1.ko | egrep "version|description|author"
version: 2.1.3
author: Xiong Huang <[email protected]>, Chris Snook <[email protected]>, Jay Cliburn <[email protected]>
description: Atheros L1 Gigabit Ethernet Driver
$ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author"
version: 2.2.3
description: Atheros Fast Ethernet Network Driver
author: Atheros Corporation <[email protected]>, Chris Snook <[email protected]>
Reported-by: Scott Scriven <[email protected]>
Signed-off-by: Alex Chiang <[email protected]>
Acked-by: Jay Cliburn <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | drivers/net/atlx/atl1.c | 6 | ||||
| -rw-r--r-- | drivers/net/atlx/atlx.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 0ab22540bf59..4e817126e280 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -82,6 +82,12 @@ #include "atl1.h" +#define ATLX_DRIVER_VERSION "2.1.3" +MODULE_AUTHOR("Xiong Huang <[email protected]>, \ + Chris Snook <[email protected]>, Jay Cliburn <[email protected]>"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(ATLX_DRIVER_VERSION); + /* Temporary hack for merging atl1 and atl2 */ #include "atlx.c" diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h index 297a03da6b7f..14054b75aa62 100644 --- a/drivers/net/atlx/atlx.h +++ b/drivers/net/atlx/atlx.h @@ -29,12 +29,6 @@ #include <linux/module.h> #include <linux/types.h> -#define ATLX_DRIVER_VERSION "2.1.3" -MODULE_AUTHOR("Xiong Huang <[email protected]>, \ - Chris Snook <[email protected]>, Jay Cliburn <[email protected]>"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(ATLX_DRIVER_VERSION); - #define ATLX_ERR_PHY 2 #define ATLX_ERR_PHY_SPEED 7 #define ATLX_ERR_PHY_RES 8 |