From: Linus Torvalds Date: Sat, 18 Jun 2005 18:42:35 +0000 (-0700) Subject: Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0e396ee43e445cb7c215a98da4e76d0ce354d9d7;p=mv-sheeva.git Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git This is a fixed-up version of the broken "upstream-2.6.13" branch, where I re-did the manual merge of drivers/net/r8169.c by hand, and made sure the history is all good. --- 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 diff --cc drivers/net/r8169.c index d6d0e43dab6,882c59fe9f8..ce449fe90e6 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@@ -415,12 -435,16 +435,16 @@@ struct rtl8169_private struct work_struct task; }; -MODULE_AUTHOR("Realtek and the Linux r8169 crew "); +MODULE_AUTHOR("Realtek and the Linux r8169 crew "); MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); module_param_array(media, int, &num_media, 0); + MODULE_PARM_DESC(media, "force phy operation. Deprecated by ethtool (8)."); module_param(rx_copybreak, int, 0); + MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames"); module_param(use_dac, int, 0); MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); + module_param_named(debug, debug.msg_enable, int, 0); + MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); MODULE_LICENSE("GPL"); MODULE_VERSION(RTL8169_VERSION);