Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 3c2ad99fed3..563e2340091 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -44,7 +44,8 @@
 #define PORT_RM9000     16      /* PMC-Sierra RM9xxx internal UART */
 #define PORT_OCTEON     17      /* Cavium OCTEON internal UART */
 #define PORT_AR7        18      /* Texas Instruments AR7 internal UART */
-#define PORT_MAX_8250   18      /* max port ID */
+#define PORT_U6_16550A  19      /* ST-Ericsson U6xxx internal UART */
+#define PORT_MAX_8250   19      /* max port ID */
 
 /*
  * ARM specific type numbers.  These are not currently guaranteed
@@ -465,7 +466,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
         if (port->sysrq) {
                 if (ch && time_before(jiffies, port->sysrq)) {
-                        handle_sysrq(ch, port->state->port.tty);
+                        handle_sysrq(ch);
                         port->sysrq = 0;
                         return 1;
                 }