Merge branch 'master'; commit 'v2.6.38-rc7' into next

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/pps.h b/include/linux/pps.h
index 0194ab06177b..a9bb1d93451a 100644
--- a/include/linux/pps.h
+++ b/include/linux/pps.h
@@ -114,11 +114,18 @@ struct pps_fdata {
         struct pps_ktime timeout;
 };
 
+struct pps_bind_args {
+        int tsformat;   /* format of time stamps */
+        int edge;       /* selected event type */
+        int consumer;   /* selected kernel consumer */
+};
+
 #include <linux/ioctl.h>
 
 #define PPS_GETPARAMS           _IOR('p', 0xa1, struct pps_kparams *)
 #define PPS_SETPARAMS           _IOW('p', 0xa2, struct pps_kparams *)
 #define PPS_GETCAP              _IOR('p', 0xa3, int *)
 #define PPS_FETCH               _IOWR('p', 0xa4, struct pps_fdata *)
+#define PPS_KC_BIND             _IOW('p', 0xa5, struct pps_bind_args *)
 
 #endif /* _PPS_H_ */