diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 20:13:19 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 20:13:19 +0400 |
commit | f2e5d078f7f02d4289db31f5f63e23e39914075e (patch) | |
tree | c739a3e70846284ae2ce3d98cecc2be1ffebe2e2 /drivers/net/ethernet/intel/igb/e1000_mac.h | |
parent | c66a566afbe6e2c94b1ae70f70cc1e3d4c73639b (diff) | |
parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) | |
download | linux-f2e5d078f7f02d4289db31f5f63e23e39914075e.tar.xz |
Merge tag 'v3.8-rc7' into regulator-core
Linux 3.8-rc7
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_mac.h')
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h index cbddc4e51e30..e2b2c4b9c951 100644 --- a/drivers/net/ethernet/intel/igb/e1000_mac.h +++ b/drivers/net/ethernet/intel/igb/e1000_mac.h @@ -33,6 +33,7 @@ #include "e1000_phy.h" #include "e1000_nvm.h" #include "e1000_defines.h" +#include "e1000_i210.h" /* * Functions that should not be called directly from drivers but can be used |