diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-14 20:43:10 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-14 20:43:10 (GMT) |
commit | 3b8f5945a24c78c77a88bd747812f7e07e075c7c (patch) | |
tree | dbd120f16acc181f662fe99dbfec9ea29d24dd5a /drivers/net/e1000e/param.c | |
parent | 886d7f444cbf72d5a424ea5fee4e34a0219d4af1 (diff) | |
parent | af667a29dd3dfc0464f83bac30cc3c63fe5d0206 (diff) | |
download | linux-fsl-qoriq-3b8f5945a24c78c77a88bd747812f7e07e075c7c.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/net/e1000e/param.c')
-rw-r--r-- | drivers/net/e1000e/param.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index a9612b0..4dd9b63 100644 --- a/drivers/net/e1000e/param.c +++ b/drivers/net/e1000e/param.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel PRO/1000 Linux driver - Copyright(c) 1999 - 2010 Intel Corporation. + Copyright(c) 1999 - 2011 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -62,10 +62,9 @@ MODULE_PARM_DESC(copybreak, module_param_array_named(X, X, int, &num_##X, 0); \ MODULE_PARM_DESC(X, desc); - /* * Transmit Interrupt Delay in units of 1.024 microseconds - * Tx interrupt delay needs to typically be set to something non zero + * Tx interrupt delay needs to typically be set to something non-zero * * Valid Range: 0-65535 */ @@ -112,6 +111,7 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate"); #define DEFAULT_ITR 3 #define MAX_ITR 100000 #define MIN_ITR 100 + /* IntMode (Interrupt Mode) * * Valid Range: 0 - 2 |