diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 13:57:41 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 13:57:41 -0800 |
| commit | 912ae66b952e249f66eef23a545e572263f989b8 (patch) | |
| tree | b71b0180fad520544b3241b0cc1e23b4c05d0054 | |
| parent | 225c5935d397e192f4d7b04a8eeab95a56ea64b4 (diff) | |
| download | patches-912ae66b952e249f66eef23a545e572263f989b8.tar.gz | |
move a tty patch to tty.current
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | tty.current/serial-8250-add-serial-transmitter-fully-empty-test.patch (renamed from tty/serial-8250-add-serial-transmitter-fully-empty-test.patch) | 1 | ||||
| -rw-r--r-- | tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch | 6 |
3 files changed, 5 insertions, 4 deletions
@@ -13,6 +13,7 @@ gregkh/gkh-version.patch ################################# # TTY patches for 2.6.33 ################################# +tty.current/serial-8250-add-serial-transmitter-fully-empty-test.patch ################################# # USB patches for 2.6.33 @@ -86,7 +87,6 @@ tty/serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.p tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch tty/serial-68328serial.c-remove-baud_table_size-macro.patch tty/serial-atmel_serial-add-poll_get_char-and-poll_put_char-uart_ops.patch -tty/serial-8250-add-serial-transmitter-fully-empty-test.patch tty/serial-synclink_gt-dropped-transmit-data-bugfix.patch tty/serial-8250_pci-add-support-for-mcs9865-syba-6x-serial-port-card.patch tty/serial-imx-fix-null-dereference-oops-when-pdata-null.patch diff --git a/tty/serial-8250-add-serial-transmitter-fully-empty-test.patch b/tty.current/serial-8250-add-serial-transmitter-fully-empty-test.patch index a3331c56ad9dde..2304a87669f299 100644 --- a/tty/serial-8250-add-serial-transmitter-fully-empty-test.patch +++ b/tty.current/serial-8250-add-serial-transmitter-fully-empty-test.patch @@ -48,6 +48,7 @@ Signed-off-by: Dick Hollenbeck <dick@softplc.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Cc: Kees Schoenmakers <k.schoenmakers@sigmae.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch b/tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch index df4133b780cc5c..7f72c92bd069bd 100644 --- a/tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch +++ b/tty/serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c -@@ -2688,6 +2688,15 @@ static void __init serial8250_isa_init_p +@@ -2689,6 +2689,15 @@ static void __init serial8250_isa_init_p } } @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __init serial8250_register_ports(struct uart_driver *drv, struct device *dev) { -@@ -2704,6 +2713,10 @@ serial8250_register_ports(struct uart_dr +@@ -2705,6 +2714,10 @@ serial8250_register_ports(struct uart_dr struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev; @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> uart_add_one_port(drv, &up->port); } } -@@ -3116,12 +3129,8 @@ int serial8250_register_port(struct uart +@@ -3117,12 +3130,8 @@ int serial8250_register_port(struct uart if (port->dev) uart->port.dev = port->dev; |