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/southbridge/nvidia/ck804/ht.c | |
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/southbridge/nvidia/ck804/ht.c')
-rw-r--r-- | src/southbridge/nvidia/ck804/ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/southbridge/nvidia/ck804/ht.c b/src/southbridge/nvidia/ck804/ht.c index 6ef39e3e27..41e29989bb 100644 --- a/src/southbridge/nvidia/ck804/ht.c +++ b/src/southbridge/nvidia/ck804/ht.c @@ -26,7 +26,7 @@ #include "ck804.h" #include <arch/acpi.h> -#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) unsigned long acpi_fill_mcfg(unsigned long current) { |