diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-14 12:43:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-14 12:43:10 -0800 |
| commit | 3b8f5945a24c78c77a88bd747812f7e07e075c7c (patch) | |
| tree | dbd120f16acc181f662fe99dbfec9ea29d24dd5a /drivers/net/e1000e/hw.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6 (diff) | |
| parent | e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs (diff) | |
| download | linux-dev-3b8f5945a24c78c77a88bd747812f7e07e075c7c.tar.xz linux-dev-3b8f5945a24c78c77a88bd747812f7e07e075c7c.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/net/e1000e/hw.h')
| -rw-r--r-- | drivers/net/e1000e/hw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index e774380c7cec..bc0860a598c9 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h @@ -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, @@ -102,7 +102,7 @@ enum e1e_registers { E1000_RDTR = 0x02820, /* Rx Delay Timer - RW */ E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */ #define E1000_RXDCTL(_n) (E1000_RXDCTL_BASE + (_n << 8)) - E1000_RADV = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */ + E1000_RADV = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */ /* Convenience macros * |