From ed7a1e87b297f6ee98ba4c0aa7ffb742e72da903 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Tue, 31 Aug 2010 14:19:09 +0200 Subject: [PATCH] --- yaml --- r: 210210 b: refs/heads/master c: 71cad0554956de87c3fc413b1eac9313887eb14f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/serial.h | 3 +-- trunk/include/linux/serial_core.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 86704d5caa67..8de1a0708fbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d86b3001a1a6f9b8be15e5e060338de085d2bbbc +refs/heads/master: 71cad0554956de87c3fc413b1eac9313887eb14f diff --git a/trunk/include/linux/serial.h b/trunk/include/linux/serial.h index 1ebc694a6d52..ef914061511e 100644 --- a/trunk/include/linux/serial.h +++ b/trunk/include/linux/serial.h @@ -77,8 +77,7 @@ struct serial_struct { #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 /* RSA-DV II/S card */ -#define PORT_U6_16550A 14 -#define PORT_MAX 14 +#define PORT_MAX 13 #define SERIAL_IO_PORT 0 #define SERIAL_IO_HUB6 1 diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h index 64458a9a8938..563e23400913 100644 --- a/trunk/include/linux/serial_core.h +++ b/trunk/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