diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-10-16 18:00:27 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-10-17 09:31:28 +0200 |
| commit | f21271edb5406577dc0a062ce3068ef17a09309d (patch) | |
| tree | 7ed818dd82644d61178d105ccbf277e787510ffb /src/northbridge/amd/amdk8 | |
| parent | 833bf20f92c38e8e3dfee12d3b81d47bcd35d906 (diff) | |
Fix mismerge of ACPI patches
Change-Id: I2a9960861465f4686113213d5e5793333b6274b2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7079
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/northbridge/amd/amdk8')
| -rw-r--r-- | src/northbridge/amd/amdk8/northbridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index bfd2c0fc47..7d12dbd1a5 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -16,7 +16,7 @@ #include <string.h> #include <lib.h> #include <cpu/cpu.h> -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) #include <arch/acpi.h> #include "acpi.h" #endif @@ -584,7 +584,7 @@ static void mcf0_control_init(struct device *dev) #endif } -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) static unsigned long northbridge_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp) { unsigned long current; @@ -616,7 +616,7 @@ static struct device_operations northbridge_operations = { .read_resources = amdk8_read_resources, .set_resources = amdk8_set_resources, .enable_resources = pci_dev_enable_resources, -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .acpi_fill_ssdt_generator = k8acpi_write_vars, .write_acpi_tables = northbridge_write_acpi_tables, #endif |