From c270bc8e7323123c24453c4ff8ccf45e4cf82d4b Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Sat, 22 Oct 2011 17:56:50 +0800 Subject: [PATCH] --- yaml --- r: 272025 b: refs/heads/master c: 6a0d89c2641671a5d29d262dbc7db8e403b543be h: refs/heads/master i: 272023: 922798549a574b361031cae162f4c49c9ab8ab25 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/sony-laptop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31e82559ec9e..7c19c01e54c4 100644 --- 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 index bbd182e178cb..c006dee5ebfe 100644 --- 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],