---

yaml --- r: 272025 b: refs/heads/master c: 6a0d89c h: refs/heads/master i: 272023: 9227985 v: v3
git-mirror · Oct 24, 2011 · c270bc8 · c270bc8
1 parent 240ee84
commit c270bc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 149083996e52c640fdfd73ad92550be4b803f349
+refs/heads/master: 6a0d89c2641671a5d29d262dbc7db8e403b543be
diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c
@@ -3281,7 +3281,7 @@ static int sony_pic_add(struct acpi_device *device)
 	/* request IRQ */
 	list_for_each_entry_reverse(irq, &spic_dev.interrupts, list) {
 		if (!request_irq(irq->irq.interrupts[0], sony_pic_irq,
-					IRQF_DISABLED, "sony-laptop", &spic_dev)) {
+					0, "sony-laptop", &spic_dev)) {
 			dprintk("IRQ: %d - triggering: %d - "
 					"polarity: %d - shr: %d\n",
 					irq->irq.interrupts[0],