diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/net/sky2.c | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a6601e8d423c..a2e804ddca6c 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -3691,6 +3691,6 @@ module_init(sky2_init_module); | |||
| 3691 | module_exit(sky2_cleanup_module); | 3691 | module_exit(sky2_cleanup_module); |
| 3692 | 3692 | ||
| 3693 | MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); | 3693 | MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); |
| 3694 | MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>"); | 3694 | MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); |
| 3695 | MODULE_LICENSE("GPL"); | 3695 | MODULE_LICENSE("GPL"); |
| 3696 | MODULE_VERSION(DRV_VERSION); | 3696 | MODULE_VERSION(DRV_VERSION); |