projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'kumar/next' into next
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
e1000e
/
ich8lan.h
diff --git
a/drivers/net/ethernet/intel/e1000e/ich8lan.h
b/drivers/net/ethernet/intel/e1000e/ich8lan.h
index
b6d3174
..
8bf4655
100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/ich8lan.h
+++ b/
drivers/net/ethernet/intel/e1000e/ich8lan.h
@@
-92,6
+92,8
@@
#define E1000_FEXTNVM4_BEACON_DURATION_8USEC 0x7
#define E1000_FEXTNVM4_BEACON_DURATION_16USEC 0x3
+#define E1000_FEXTNVM6_REQ_PLL_CLK 0x00000100
+
#define PCIE_ICH8_SNOOP_ALL PCIE_NO_SNOOP_ALL
#define E1000_ICH_RAR_ENTRIES 7