diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/enic/vnic_enet.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/enic/vnic_enet.h')
| -rw-r--r-- | drivers/net/enic/vnic_enet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h index 3b3291248956..e8740e3704e4 100644 --- a/drivers/net/enic/vnic_enet.h +++ b/drivers/net/enic/vnic_enet.h | |||
| @@ -30,7 +30,7 @@ struct vnic_enet_config { | |||
| 30 | u32 wq_desc_count; | 30 | u32 wq_desc_count; |
| 31 | u32 rq_desc_count; | 31 | u32 rq_desc_count; |
| 32 | u16 mtu; | 32 | u16 mtu; |
| 33 | u16 intr_timer; | 33 | u16 intr_timer_deprecated; |
| 34 | u8 intr_timer_type; | 34 | u8 intr_timer_type; |
| 35 | u8 intr_mode; | 35 | u8 intr_mode; |
| 36 | char devname[16]; | 36 | char devname[16]; |