---

yaml --- r: 280985 b: refs/heads/master c: 0775c98 h: refs/heads/master i: 280983: feb971e v: v3
git-mirror · Nov 27, 2011 · ade3d7c · ade3d7c
1 parent 430fd22
commit ade3d7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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.
 			*/