projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[linux-2.6-microblaze.git]
/
drivers
/
ptp
/
ptp_vclock.c
diff --git
a/drivers/ptp/ptp_vclock.c
b/drivers/ptp/ptp_vclock.c
index
e0f87c5
..
baee037
100644
(file)
--- a/
drivers/ptp/ptp_vclock.c
+++ b/
drivers/ptp/ptp_vclock.c
@@
-149,6
+149,7
@@
void ptp_vclock_unregister(struct ptp_vclock *vclock)
kfree(vclock);
}
+#if IS_BUILTIN(CONFIG_PTP_1588_CLOCK)
int ptp_get_vclocks_index(int pclock_index, int **vclock_index)
{
char name[PTP_CLOCK_NAME_LEN] = "";
@@
-217,3
+218,4
@@
void ptp_convert_timestamp(struct skb_shared_hwtstamps *hwtstamps,
hwtstamps->hwtstamp = ns_to_ktime(ns);
}
EXPORT_SYMBOL(ptp_convert_timestamp);
+#endif