projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f28ba40
)
e1000e: convert to CYCLECOUNTER_MASK macro.
author
Richard Cochran
<
[email protected]
>
Fri, 2 Jan 2015 19:22:05 +0000
(20:22 +0100)
committer
David S. Miller
<
[email protected]
>
Fri, 2 Jan 2015 21:47:35 +0000
(16:47 -0500)
Signed-off-by: Richard Cochran <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/intel/e1000e/netdev.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
index 2537d36a47cc6ae234f3226e4cfe8826d7b7ed40..332a298e95b551f5d4197274fbb906308a00a0b0 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/
drivers/net/ethernet/intel/e1000e/netdev.c
@@
-43,7
+43,6
@@
#include <linux/pm_runtime.h>
#include <linux/aer.h>
#include <linux/prefetch.h>
-#include <linux/clocksource.h>
#include "e1000.h"
@@
-4190,7
+4189,7
@@
static int e1000_sw_init(struct e1000_adapter *adapter)
/* Setup hardware time stamping cyclecounter */
if (adapter->flags & FLAG_HAS_HW_TIMESTAMP) {
adapter->cc.read = e1000e_cyclecounter_read;
- adapter->cc.mask = C
LOCKSOURCE
_MASK(64);
+ adapter->cc.mask = C
YCLECOUNTER
_MASK(64);
adapter->cc.mult = 1;
/* cc.shift set in e1000e_get_base_tininca() */