Merge branch 'x86/apic' into x86/irq

Reason: Update to latest genirq code conflicts with pending apic
	changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index beb1afa27d8d..7b951adac54b 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 910870edf708..750b4f627315 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;