diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 19:24:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 19:24:01 -0400 |
| commit | 814d8ffd5009e13f1266759b583ef847c5350d77 (patch) | |
| tree | 00b01e4ccac6ba82ab5e67c27103f6f75f8ccf9d /drivers | |
| parent | 386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 (diff) | |
| parent | 1c2fb7f93cb20621772bf304f3dba0849942e5db (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index b3768d844747..d6d0e43dab65 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -415,7 +415,7 @@ struct rtl8169_private { | |||
| 415 | struct work_struct task; | 415 | struct work_struct task; |
| 416 | }; | 416 | }; |
| 417 | 417 | ||
| 418 | MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@oss.sgi.com>"); | 418 | MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>"); |
| 419 | MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); | 419 | MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); |
| 420 | module_param_array(media, int, &num_media, 0); | 420 | module_param_array(media, int, &num_media, 0); |
| 421 | module_param(rx_copybreak, int, 0); | 421 | module_param(rx_copybreak, int, 0); |