diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /drivers/net/e1000e/hw.h | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'drivers/net/e1000e/hw.h')
| -rw-r--r-- | drivers/net/e1000e/hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 2784cf44a6f..eccf29b75c4 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
| @@ -818,6 +818,7 @@ struct e1000_mac_info { | |||
| 818 | 818 | ||
| 819 | u8 forced_speed_duplex; | 819 | u8 forced_speed_duplex; |
| 820 | 820 | ||
| 821 | bool adaptive_ifs; | ||
| 821 | bool arc_subsystem_valid; | 822 | bool arc_subsystem_valid; |
| 822 | bool autoneg; | 823 | bool autoneg; |
| 823 | bool autoneg_failed; | 824 | bool autoneg_failed; |