diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:04:18 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:04:18 -0500 |
| commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/net | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) | |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/irda/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/r8169.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 1c553d7efdd..ca5914091d3 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -389,7 +389,7 @@ config VIA_FIR help Say Y here if you want to build support for the VIA VT8231 and VIA VT1211 IrDA controllers, found on the motherboards using - those those VIA chipsets. To use this controller, you will need + those VIA chipsets. To use this controller, you will need to plug a specific 5 pins FIR IrDA dongle in the specific motherboard connector. The driver provides support for SIR, MIR and FIR (4Mbps) speeds. diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index b3768d84474..d6d0e43dab6 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -415,7 +415,7 @@ struct rtl8169_private { struct work_struct task; }; -MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@oss.sgi.com>"); +MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>"); MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); module_param_array(media, int, &num_media, 0); module_param(rx_copybreak, int, 0); |