From 4254e6218edf60347b442f328fd8529d27a66b81 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Mon, 31 Dec 2012 00:07:24 +0000 Subject: [PATCH] --- yaml --- r: 350895 b: refs/heads/master c: f7b488e23cadc76503cbf37d7c432cfb0a77f41f h: refs/heads/master i: 350893: 81dbf7a8e9e4b5ea2c85416aa84173be24ec813f 350891: 72e5c68e69585e94f096f684053ed7f87fee70c3 350887: e37f395af0cd1a0abe7f9c1087d6d6f2f9671512 350879: f653958984cdfb1ba0cf37920e571b2833ffb5e0 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/rsirq.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e6344f197d7a..df4ef62f592e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef42e53f271b99fe9eb853df5661edeac8a277f6 +refs/heads/master: f7b488e23cadc76503cbf37d7c432cfb0a77f41f diff --git a/trunk/drivers/acpi/acpica/rsirq.c b/trunk/drivers/acpi/acpica/rsirq.c index 14cb76e03e14..f3733ee0cac8 100644 --- a/trunk/drivers/acpi/acpica/rsirq.c +++ b/trunk/drivers/acpi/acpica/rsirq.c @@ -190,8 +190,10 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_irq[9] = { sizeof(struct aml_resource_extended_irq), 0}, - /* Flag bits */ - + /* + * Flags: Producer/Consumer[0], Triggering[1], Polarity[2], + * sharing_and_wake[3:4] + */ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.producer_consumer), AML_OFFSET(extended_irq.flags), 0}, @@ -204,7 +206,7 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_irq[9] = { AML_OFFSET(extended_irq.flags), 2}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.sharable), + {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.extended_irq.sharable), AML_OFFSET(extended_irq.flags), 3}, @@ -283,7 +285,6 @@ struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = { * request_lines * Channels */ - {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_dma.request_lines), AML_OFFSET(fixed_dma.request_lines), 2}, @@ -291,5 +292,4 @@ struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = { {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_dma.width), AML_OFFSET(fixed_dma.width), 1}, - };