Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (25 commits)
  serial: Tidy REMOTE_DEBUG
  serial: isicomm: handle running out of slots
  serial: bfin_sport_uart: Use resource size to fix off-by-one error
  tty: fix obsolete comment on tty_insert_flip_string_fixed_flag
  serial: Add driver for the Altera UART
  serial: Add driver for the Altera JTAG UART
  serial: timbuart: make sure last byte is sent when port is closed
  serial: two branches the same in timbuart_set_mctrl()
  serial: uartlite: move from byte accesses to word accesses
  tty: n_gsm: depends on NET
  tty: n_gsm line discipline
  serial: TTY: new ldiscs for staging
  serial: bfin_sport_uart: drop redundant cpu depends
  serial: bfin_sport_uart: drop the experimental markings
  serial: bfin_sport_uart: pull in bfin_sport.h for SPORT defines
  serial: bfin_sport_uart: only enable SPORT TX if data is to be sent
  serial: bfin_sport_uart: drop useless status masks
  serial: bfin_sport_uart: zero sport_uart_port if allocated dynamically
  serial: bfin_sport_uart: protect changes to uart_port
  serial: bfin_sport_uart: add support for CTS/RTS via GPIOs
  ...

5 files changed, 61 insertions, 1 deletions

diff --git a/include/linux/altera_jtaguart.h b/include/linux/altera_jtaguart.h
new file mode 100644
index 000000000000..953b178a1650
--- /dev/null
+++ b/include/linux/altera_jtaguart.h
@@ -0,0 +1,16 @@
+/*
+ * altera_jtaguart.h -- Altera JTAG UART driver defines.
+ */
+
+#ifndef __ALTJUART_H
+#define __ALTJUART_H
+
+#define ALTERA_JTAGUART_MAJOR   204
+#define ALTERA_JTAGUART_MINOR   186
+
+struct altera_jtaguart_platform_uart {
+        unsigned long mapbase;  /* Physical address base */
+        unsigned int irq;       /* Interrupt vector */
+};
+
+#endif /* __ALTJUART_H */
diff --git a/include/linux/altera_uart.h b/include/linux/altera_uart.h
new file mode 100644
index 000000000000..8d441064a30d
--- /dev/null
+++ b/include/linux/altera_uart.h
@@ -0,0 +1,14 @@
+/*
+ * altera_uart.h -- Altera UART driver defines.
+ */
+
+#ifndef __ALTUART_H
+#define __ALTUART_H
+
+struct altera_uart_platform_uart {
+        unsigned long mapbase;  /* Physical address base */
+        unsigned int irq;       /* Interrupt vector */
+        unsigned int uartclk;   /* UART clock rate */
+};
+
+#endif /* __ALTUART_H */
diff --git a/include/linux/gsmmux.h b/include/linux/gsmmux.h
new file mode 100644
index 000000000000..378de4195caf
--- /dev/null
+++ b/include/linux/gsmmux.h
@@ -0,0 +1,25 @@
+#ifndef _LINUX_GSMMUX_H
+#define _LINUX_GSMMUX_H
+
+struct gsm_config
+{
+        unsigned int adaption;
+        unsigned int encapsulation;
+        unsigned int initiator;
+        unsigned int t1;
+        unsigned int t2;
+        unsigned int t3;
+        unsigned int n2;
+        unsigned int mru;
+        unsigned int mtu;
+        unsigned int k;
+        unsigned int i;
+        unsigned int unused[8];         /* Padding for expansion without
+                                           breaking stuff */
+};
+
+#define GSMIOC_GETCONF          _IOR('G', 0, struct gsm_config)
+#define GSMIOC_SETCONF          _IOW('G', 1, struct gsm_config)
+
+
+#endif
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 78dd1e7120a9..09d0d2d5a08b 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -182,6 +182,10 @@
 /* Aeroflex Gaisler GRLIB APBUART */
 #define PORT_APBUART    90
 
+/* Altera UARTs */
+#define PORT_ALTERA_JTAGUART    91
+#define PORT_ALTERA_UART        92
+
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>
diff --git a/include/linux/tty.h b/include/linux/tty.h
index bb44fa9ae135..931078b73226 100644
--- a/include/linux/tty.h
+++ b/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               21
+#define NR_LDISCS               30
 
 /* line disciplines */
 #define N_TTY           0
@@ -48,6 +48,7 @@
 #define N_PPS           18      /* Pulse per Second */
 #define N_V253          19      /* Codec control over voice modem */
 #define N_CAIF          20      /* CAIF protocol for talking to modems */
+#define N_GSM0710       21      /* GSM 0710 Mux */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as