From e4a06117fdd0940a747d842addecf977c67c0295 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 10:37:17 +0100
Subject: [PATCH] --- yaml --- r: 113437 b: refs/heads/master c:
 348eb12e5598be97400c749d3d93a71856ae0b2b h: refs/heads/master i:   113435:
 4c2b1d8d41033fdde1dce4e98d84f2285e278d33 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/tty.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4e6528738e4..f9515a3bb5dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e48565d217a8a96cc7577308ad41e9e4b806a62
+refs/heads/master: 348eb12e5598be97400c749d3d93a71856ae0b2b
diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h
index 7271c6247d82..e3612c3ac194 100644
--- a/trunk/include/linux/tty.h
+++ b/trunk/include/linux/tty.h
@@ -23,7 +23,7 @@
  */
 #define NR_UNIX98_PTY_DEFAULT	4096      /* Default maximum for Unix98 ptys */
 #define NR_UNIX98_PTY_MAX	(1 << MINORBITS) /* Absolute limit */
-#define NR_LDISCS		18
+#define NR_LDISCS		19
 
 /* line disciplines */
 #define N_TTY		0
@@ -45,6 +45,7 @@
 #define N_HCI		15	/* Bluetooth HCI UART */
 #define N_GIGASET_M101	16	/* Siemens Gigaset M101 serial DECT adapter */
 #define N_SLCAN		17	/* Serial / USB serial CAN Adaptors */
+#define N_PPS		18	/* Pulse per Second */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as