git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Staging: Merge staging-next into Linus's tree
[sfrench/cifs-2.6.git]
/
net
/
core
/
Makefile
diff --git
a/net/core/Makefile
b/net/core/Makefile
index 51c3eec850ef426bc2614f309ad08182b595df69..8a04dd22cf77c706c8613edd9d0c64bf57fa3613 100644
(file)
--- a/
net/core/Makefile
+++ b/
net/core/Makefile
@@
-18,4
+18,4
@@
obj-$(CONFIG_NET_DMA) += user_dma.o
obj-$(CONFIG_FIB_RULES) += fib_rules.o
obj-$(CONFIG_TRACEPOINTS) += net-traces.o
obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o
-
+obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += timestamping.o