diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:25 +0100 |
| commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
| tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /drivers/tty | |
| parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
| parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) | |
| download | op-kernel-dev-888a8a3e9d79cbb9d83e53955f684998248580ec.zip op-kernel-dev-888a8a3e9d79cbb9d83e53955f684998248580ec.tar.gz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/max3100.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/max3107.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c index beb1afa2..7b951ad 100644 --- a/drivers/tty/serial/max3100.c +++ b/drivers/tty/serial/max3100.c @@ -601,7 +601,7 @@ static int max3100_startup(struct uart_port *port) s->rts = 0; sprintf(b, "max3100-%d", s->minor); - s->workqueue = create_freezeable_workqueue(b); + s->workqueue = create_freezable_workqueue(b); if (!s->workqueue) { dev_warn(&s->spi->dev, "cannot create workqueue\n"); return -EBUSY; diff --git a/drivers/tty/serial/max3107.c b/drivers/tty/serial/max3107.c index 910870e..750b4f6 100644 --- a/drivers/tty/serial/max3107.c +++ b/drivers/tty/serial/max3107.c @@ -833,7 +833,7 @@ static int max3107_startup(struct uart_port *port) struct max3107_port *s = container_of(port, struct max3107_port, port); /* Initialize work queue */ - s->workqueue = create_freezeable_workqueue("max3107"); + s->workqueue = create_freezable_workqueue("max3107"); if (!s->workqueue) { dev_err(&s->spi->dev, "Workqueue creation failed\n"); return -EBUSY; |
