Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[pandora-kernel.git] / include / linux / tty_ldisc.h

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index fb79dd8..455a0d7 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -100,16 +100,14 @@
  *     seek to perform this action quickly but should wait until
  *     any pending driver I/O is completed.
  *
- * void (*dcd_change)(struct tty_struct *tty, unsigned int status,
- *                     struct pps_event_time *ts)
+ * void (*dcd_change)(struct tty_struct *tty, unsigned int status)
  *
- *     Tells the discipline that the DCD pin has changed its status and
- *     the relative timestamp. Pointer ts cannot be NULL.
+ *     Tells the discipline that the DCD pin has changed its status.
+ *     Used exclusively by the N_PPS (Pulse-Per-Second) line discipline.
  */
 
 #include <linux/fs.h>
 #include <linux/wait.h>
-#include <linux/pps_kernel.h>
 #include <linux/wait.h>
 
 struct tty_ldisc_ops {
@@ -144,8 +142,7 @@ struct tty_ldisc_ops {
        void    (*receive_buf)(struct tty_struct *, const unsigned char *cp,
                               char *fp, int count);
        void    (*write_wakeup)(struct tty_struct *);
-       void    (*dcd_change)(struct tty_struct *, unsigned int,
-                               struct pps_event_time *);
+       void    (*dcd_change)(struct tty_struct *, unsigned int);
 
        struct  module *owner;