From 9462e140653048856947b31612590a8b98222787 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 15 Mar 2017 11:12:17 -0700 Subject: acpi_device: Prefix IRQ macros with ACPI Switch some IRQ_* macros to ACPI_IRQ_* instead so they do not fail at compile time if they are used. BUG=b:35581264 BRANCH=none TEST=successfully compile with ACPI_GPIO_IRQ_LEVEL_HIGH Change-Id: Id4040eca4c7c9d8f7b4f0add411d5d6fe5ed1eb8 Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/18833 Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/arch/x86/include/arch/acpi_device.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/arch/x86/include') diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index 08dae65db4..6933f315ba 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -195,8 +195,8 @@ struct acpi_gpio { #define ACPI_GPIO_IRQ_EDGE_LOW(gpio) { \ .type = ACPI_GPIO_TYPE_INTERRUPT, \ .pull = ACPI_GPIO_PULL_DEFAULT, \ - .irq.mode = IRQ_EDGE_TRIGGERED, \ - .irq.polarity = IRQ_ACTIVE_LOW, \ + .irq.mode = ACPI_IRQ_EDGE_TRIGGERED, \ + .irq.polarity = ACPI_IRQ_ACTIVE_LOW, \ .pin_count = 1, \ .pins = { (gpio) } } @@ -204,8 +204,8 @@ struct acpi_gpio { #define ACPI_GPIO_IRQ_LEVEL_HIGH(gpio) { \ .type = ACPI_GPIO_TYPE_INTERRUPT, \ .pull = ACPI_GPIO_PULL_DEFAULT, \ - .irq.mode = IRQ_LEVEL_TRIGGERED, \ - .irq.polarity = IRQ_ACTIVE_HIGH, \ + .irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \ + .irq.polarity = ACPI_IRQ_ACTIVE_HIGH, \ .pin_count = 1, \ .pins = { (gpio) } } @@ -213,8 +213,8 @@ struct acpi_gpio { #define ACPI_GPIO_IRQ_LEVEL_LOW(gpio) { \ .type = ACPI_GPIO_TYPE_INTERRUPT, \ .pull = ACPI_GPIO_PULL_DEFAULT, \ - .irq.mode = IRQ_LEVEL_TRIGGERED, \ - .irq.polarity = IRQ_ACTIVE_LOW, \ + .irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \ + .irq.polarity = ACPI_IRQ_ACTIVE_LOW, \ .pin_count = 1, \ .pins = { (gpio) } } -- cgit v1.2.3