diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/e1000e | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/e1000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index d6e491bc58c9..981936c1fb46 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h | |||
| @@ -62,7 +62,7 @@ struct e1000_info; | |||
| 62 | e_printk(KERN_NOTICE, adapter, format, ## arg) | 62 | e_printk(KERN_NOTICE, adapter, format, ## arg) |
| 63 | 63 | ||
| 64 | 64 | ||
| 65 | /* Interrupt modes, as used by the IntMode paramter */ | 65 | /* Interrupt modes, as used by the IntMode parameter */ |
| 66 | #define E1000E_INT_MODE_LEGACY 0 | 66 | #define E1000E_INT_MODE_LEGACY 0 |
| 67 | #define E1000E_INT_MODE_MSI 1 | 67 | #define E1000E_INT_MODE_MSI 1 |
| 68 | #define E1000E_INT_MODE_MSIX 2 | 68 | #define E1000E_INT_MODE_MSIX 2 |