diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 1 | ||||
| -rw-r--r-- | include/linux/tty_ldisc.h | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index d97142159e0f..87d4bbc773fc 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/tty.h> | 29 | #include <linux/tty.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/sysrq.h> | 31 | #include <linux/sysrq.h> |
| 32 | #include <linux/pps_kernel.h> | ||
| 33 | #include <uapi/linux/serial_core.h> | 32 | #include <uapi/linux/serial_core.h> |
| 34 | 33 | ||
| 35 | struct uart_port; | 34 | struct uart_port; |
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h index fb79dd8d1537..455a0d7bf220 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h | |||
| @@ -100,16 +100,14 @@ | |||
| 100 | * seek to perform this action quickly but should wait until | 100 | * seek to perform this action quickly but should wait until |
| 101 | * any pending driver I/O is completed. | 101 | * any pending driver I/O is completed. |
| 102 | * | 102 | * |
| 103 | * void (*dcd_change)(struct tty_struct *tty, unsigned int status, | 103 | * void (*dcd_change)(struct tty_struct *tty, unsigned int status) |
| 104 | * struct pps_event_time *ts) | ||
| 105 | * | 104 | * |
| 106 | * Tells the discipline that the DCD pin has changed its status and | 105 | * Tells the discipline that the DCD pin has changed its status. |
| 107 | * the relative timestamp. Pointer ts cannot be NULL. | 106 | * Used exclusively by the N_PPS (Pulse-Per-Second) line discipline. |
| 108 | */ | 107 | */ |
| 109 | 108 | ||
| 110 | #include <linux/fs.h> | 109 | #include <linux/fs.h> |
| 111 | #include <linux/wait.h> | 110 | #include <linux/wait.h> |
| 112 | #include <linux/pps_kernel.h> | ||
| 113 | #include <linux/wait.h> | 111 | #include <linux/wait.h> |
| 114 | 112 | ||
| 115 | struct tty_ldisc_ops { | 113 | struct tty_ldisc_ops { |
| @@ -144,8 +142,7 @@ struct tty_ldisc_ops { | |||
| 144 | void (*receive_buf)(struct tty_struct *, const unsigned char *cp, | 142 | void (*receive_buf)(struct tty_struct *, const unsigned char *cp, |
| 145 | char *fp, int count); | 143 | char *fp, int count); |
| 146 | void (*write_wakeup)(struct tty_struct *); | 144 | void (*write_wakeup)(struct tty_struct *); |
| 147 | void (*dcd_change)(struct tty_struct *, unsigned int, | 145 | void (*dcd_change)(struct tty_struct *, unsigned int); |
| 148 | struct pps_event_time *); | ||
| 149 | 146 | ||
| 150 | struct module *owner; | 147 | struct module *owner; |
| 151 | 148 | ||
