From ade3d7c1aa3747b83d78e5cb1cdca527173b5aa8 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 23 Oct 2011 23:18:04 +0200 Subject: [PATCH] --- yaml --- r: 280985 b: refs/heads/master c: 0775c98acfdaffd857656bc9a465ad4008e90a9c h: refs/heads/master i: 280983: feb971e2bb2fc5e6bf923886b5da2c6421dc8824 v: v3 --- [refs] | 2 +- trunk/drivers/staging/serial/68360serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4eaf673bb786..25ac7f47c8ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54dbf04f91ec54621c6cd2dda58b7c77ca25cf1f +refs/heads/master: 0775c98acfdaffd857656bc9a465ad4008e90a9c diff --git a/trunk/drivers/staging/serial/68360serial.c b/trunk/drivers/staging/serial/68360serial.c index 0a3e8787ed50..daf0b1d0dc28 100644 --- a/trunk/drivers/staging/serial/68360serial.c +++ b/trunk/drivers/staging/serial/68360serial.c @@ -2771,8 +2771,8 @@ static int __init rs_360_init(void) */ /* cpm_install_handler(IRQ_MACHSPEC | state->irq, rs_360_interrupt, info); */ /*request_irq(IRQ_MACHSPEC | state->irq, rs_360_interrupt, */ - request_irq(state->irq, rs_360_interrupt, - IRQ_FLG_LOCK, "ttyS", (void *)info); + request_irq(state->irq, rs_360_interrupt, 0, "ttyS", + (void *)info); /* Set up the baud rate generator. */