From af7e4d5e56a2c88323f16dcdc3b023bcf117f72d Mon Sep 17 00:00:00 2001
From: Richard Cochran <richardcochran@gmail.com>
Date: Tue, 3 Apr 2012 22:59:16 +0000
Subject: [PATCH] --- yaml --- r: 300466 b: refs/heads/master c:
 995a9090b2b7dc734351f3ac0ba8d913ffb87001 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/ptp/ptp_clock.c          | 6 ++++++
 trunk/include/linux/ptp_clock_kernel.h | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 15b122493c94..3a94a6c869e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2173bff5dcff4ca02226978f39648b66a8c3ca1e
+refs/heads/master: 995a9090b2b7dc734351f3ac0ba8d913ffb87001
diff --git a/trunk/drivers/ptp/ptp_clock.c b/trunk/drivers/ptp/ptp_clock.c
index f519a131238d..1e528b539a07 100644
--- a/trunk/drivers/ptp/ptp_clock.c
+++ b/trunk/drivers/ptp/ptp_clock.c
@@ -304,6 +304,12 @@ void ptp_clock_event(struct ptp_clock *ptp, struct ptp_clock_event *event)
 }
 EXPORT_SYMBOL(ptp_clock_event);
 
+int ptp_clock_index(struct ptp_clock *ptp)
+{
+	return ptp->index;
+}
+EXPORT_SYMBOL(ptp_clock_index);
+
 /* module operations */
 
 static void __exit ptp_exit(void)
diff --git a/trunk/include/linux/ptp_clock_kernel.h b/trunk/include/linux/ptp_clock_kernel.h
index dd2e44fba63e..945704c2ed65 100644
--- a/trunk/include/linux/ptp_clock_kernel.h
+++ b/trunk/include/linux/ptp_clock_kernel.h
@@ -136,4 +136,12 @@ struct ptp_clock_event {
 extern void ptp_clock_event(struct ptp_clock *ptp,
 			    struct ptp_clock_event *event);
 
+/**
+ * ptp_clock_index() - obtain the device index of a PTP clock
+ *
+ * @ptp:    The clock obtained from ptp_clock_register().
+ */
+
+extern int ptp_clock_index(struct ptp_clock *ptp);
+
 #endif